mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-12-25 03:13:20 +02:00
adm5120: use the generic image_cmdline hack
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@17564 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
parent
31cee17e38
commit
f23543c360
@ -237,18 +237,22 @@ static void __init prom_detect_machtype(void)
|
||||
adm5120_mach_type = MACH_ADM5120_GENERIC;
|
||||
}
|
||||
|
||||
/* TODO: this is an ugly hack for RouterBOARDS */
|
||||
extern char _image_cmdline;
|
||||
#ifdef CONFIG_IMAGE_CMDLINE_HACK
|
||||
extern char __image_cmdline[];
|
||||
|
||||
static void __init prom_init_cmdline(void)
|
||||
{
|
||||
char *cmd;
|
||||
|
||||
/* init command line, register a default kernel command line */
|
||||
cmd = &_image_cmdline + 8;
|
||||
cmd = __image_cmdline;
|
||||
if (strlen(cmd) > 0)
|
||||
strlcpy(arcs_cmdline, cmd, sizeof(arcs_cmdline));
|
||||
|
||||
}
|
||||
#else
|
||||
static void inline prom_init_cmdline(void) {}
|
||||
#endif /* CONFIG_IMAGE_CMDLINE_HACK */
|
||||
|
||||
#define UART_READ(r) \
|
||||
__raw_readl((void __iomem *)(KSEG1ADDR(ADM5120_UART0_BASE)+(r)))
|
||||
|
@ -1,15 +0,0 @@
|
||||
--- a/arch/mips/kernel/head.S
|
||||
+++ b/arch/mips/kernel/head.S
|
||||
@@ -127,7 +127,12 @@
|
||||
/*
|
||||
* Reserved space for exception handlers.
|
||||
* Necessary for machines which link their kernels at KSEG0.
|
||||
+ * Use as temporary storage for the kernel command line, so that it
|
||||
+ * can be updated easily without having to relink the kernel.
|
||||
*/
|
||||
+
|
||||
+EXPORT(_image_cmdline)
|
||||
+ .ascii "CMDLINE:"
|
||||
.fill 0x400
|
||||
#endif
|
||||
|
@ -1,15 +0,0 @@
|
||||
--- a/arch/mips/kernel/head.S
|
||||
+++ b/arch/mips/kernel/head.S
|
||||
@@ -127,7 +127,12 @@
|
||||
/*
|
||||
* Reserved space for exception handlers.
|
||||
* Necessary for machines which link their kernels at KSEG0.
|
||||
+ * Use as temporary storage for the kernel command line, so that it
|
||||
+ * can be updated easily without having to relink the kernel.
|
||||
*/
|
||||
+
|
||||
+EXPORT(_image_cmdline)
|
||||
+ .ascii "CMDLINE:"
|
||||
.fill 0x400
|
||||
#endif
|
||||
|
@ -124,7 +124,7 @@ CONFIG_HZ_250=y
|
||||
# CONFIG_IDE is not set
|
||||
CONFIG_IEEE80211=m
|
||||
CONFIG_IEEE80211_CRYPT_WEP=m
|
||||
# CONFIG_IMAGE_CMDLINE_HACK is not set
|
||||
CONFIG_IMAGE_CMDLINE_HACK=y
|
||||
CONFIG_INITRAMFS_SOURCE=""
|
||||
CONFIG_INOTIFY=y
|
||||
CONFIG_INOTIFY_USER=y
|
||||
|
@ -135,7 +135,7 @@ CONFIG_HZ=250
|
||||
# CONFIG_HZ_100 is not set
|
||||
CONFIG_HZ_250=y
|
||||
# CONFIG_I2C is not set
|
||||
# CONFIG_IMAGE_CMDLINE_HACK is not set
|
||||
CONFIG_IMAGE_CMDLINE_HACK=y
|
||||
CONFIG_INITRAMFS_SOURCE=""
|
||||
CONFIG_INOTIFY=y
|
||||
CONFIG_INOTIFY_USER=y
|
||||
|
Loading…
Reference in New Issue
Block a user