summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Smith <alex.smith@imgtec.com>2015-06-30 18:13:38 +0300
committerAlex Smith <alex.smith@imgtec.com>2015-07-07 17:00:42 +0300
commit4a60c4d061cc2c04f7f1e916a53c632aa98d9919 (patch)
tree48b078efe254033689dafa6af11fea3a28a7b3f7
parentde7366e799a626a4f997a6c769ecab672fcea32e (diff)
downloadCI20_u-boot-4a60c4d061cc2c04f7f1e916a53c632aa98d9919.tar.xz
ci20: Update default configuration for 3.18 kernel
For the 3.18 kernel a number of configuration changes need to be made. These are as follows: * We have added a command line option as a temporary method to pass the Ethernet MAC address to the kernel. Add this to the default command line. Since U-Boot won't substitute variables inside the bootargs string, we change the default boot command to run a command to append the MAC address to the bootargs variable, which will perform variable substitution when executed. * Add rootwait to the kernel command line, which is necessary to avoid a kernel panic at boot if the kernel attempts to mount the root FS before the root device driver has been probed. * Correct UBI system partition index to 3 in default NAND command line. * Change the default kernel path to uImage rather than vmlinux.img, as this is the name the Debian kernel packages install the kernel as. Signed-off-by: Alex Smith <alex.smith@imgtec.com>
-rw-r--r--include/configs/ci20.h16
1 files changed, 9 insertions, 7 deletions
diff --git a/include/configs/ci20.h b/include/configs/ci20.h
index d5deb3eb3..ee808ce1b 100644
--- a/include/configs/ci20.h
+++ b/include/configs/ci20.h
@@ -74,33 +74,35 @@
#define CONFIG_BOOTDELAY 2
#define CONFIG_SYS_BOOTM_LEN (64 << 20)
-#define BOOTARGS_COMMON "console=ttyS4,115200 console=tty0 mem=256M@0x0 mem=768M@0x30000000"
+#define BOOTARGS_COMMON \
+ "console=ttyS4,115200 console=tty0 mem=256M@0x0 mem=768M@0x30000000 rootwait"
#ifdef CONFIG_SPL_MMC_SUPPORT
/* SD/MMC card defaults */
#define CONFIG_BOOTARGS \
- BOOTARGS_COMMON " root=/dev/mmcblk0p1"
+ BOOTARGS_COMMON " root=/dev/mmcblk0p1"
#define CONFIG_BOOTCOMMAND \
- "ext4load mmc 0:1 0x88000000 /boot/vmlinux.img; bootm 0x88000000"
+ "run ethargs; ext4load mmc 0:1 0x88000000 /boot/uImage; bootm 0x88000000"
#else /* !CONFIG_SPL_MMC_SUPPORT */
/* NAND defaults */
#define CONFIG_BOOTARGS \
- BOOTARGS_COMMON " ubi.mtd=1 root=ubi0:root rootfstype=ubifs rw"
+ BOOTARGS_COMMON " ubi.mtd=3 root=ubi0:root rootfstype=ubifs rw"
#define CONFIG_BOOTCOMMAND \
- "mtdparts default; ubi part system; ubifsmount ubi:boot; " \
- "ubifsload 0x88000000 vmlinux.img; bootm 0x88000000"
+ "run ethargs; mtdparts default; ubi part system; ubifsmount ubi:boot; " \
+ "ubifsload 0x88000000 uImage; bootm 0x88000000"
#endif /* !CONFIG_SPL_MMC_SUPPORT */
#define CONFIG_EXTRA_ENV_SETTINGS \
"stdin=eserial0,eserial4\0" \
"stdout=eserial0,eserial4\0" \
- "stderr=eserial0,eserial4\0"
+ "stderr=eserial0,eserial4\0" \
+ "ethargs=env set bootargs ${bootargs} dm9000.mac_addr=${ethaddr}\0"
#define CONFIG_SYS_HUSH_PARSER