705240eeb5
Bump U-Boot for Kirkwood to upstream 2016.09.01. Local patches cleaned up and reworked. Signed-off-by: Paul Wassi <p.wassi@gmx.at>
21 lines
646 B
Diff
21 lines
646 B
Diff
--- a/include/configs/ib62x0.h
|
|
+++ b/include/configs/ib62x0.h
|
|
@@ -74,7 +74,8 @@
|
|
"mtdparts=orion_nand:" \
|
|
"0xe0000@0x0(uboot)," \
|
|
"0x20000@0xe0000(uboot_env)," \
|
|
- "-@0x100000(root)\0"
|
|
+ "0x100000@0x100000(second_stage_uboot)," \
|
|
+ "-@0x200000(root)\0"
|
|
|
|
#define CONFIG_EXTRA_ENV_SETTINGS \
|
|
"console=console=ttyS0,115200\0" \
|
|
@@ -82,7 +83,7 @@
|
|
"mtdparts="CONFIG_MTDPARTS \
|
|
"kernel=/boot/zImage\0" \
|
|
"fdt=/boot/ib62x0.dtb\0" \
|
|
- "bootargs_root=ubi.mtd=2 root=ubi0:rootfs rootfstype=ubifs rw\0"
|
|
+ "bootargs_root=ubi.mtd=3 root=ubi0:rootfs rootfstype=ubifs rw\0"
|
|
|
|
/*
|
|
* Ethernet driver configuration
|