Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 306ab0de05cdbeba05ca689496f614109d27deb6

Authored by Allen Xu
1 parent 0168d205fa
Exists in smarc-imx-l5.0.0_1.0.0-ga

MLK-9918: Reserve more space in uboot partition for NAND boot configurations 

Expand the uboot space to 64m to reserve enough space for FCB, DBBT and
u-boot.

Signed-off-by: Allen Xu <b45815@freescale.com>
(cherry picked from commit 54b3f6ba9097f4ed4cc8953a806c872444875a29)

Showing 4 changed files with 7 additions and 7 deletions Side-by-side Diff

include/configs/mx6qsabreauto.h
Diff comments   View file @ 306ab0d
... ... @@ -21,7 +21,7 @@
21 21  
22 22 #undef CONFIG_MFG_NAND_PARTITION
23 23 #ifdef CONFIG_SYS_BOOT_NAND
24   -#define CONFIG_MFG_NAND_PARTITION "mtdparts=8000000.nor:1m(boot),-(rootfs)\\\\;gpmi-nand:16m(boot),16m(kernel),16m(dtb),-(rootfs) "
  24 +#define CONFIG_MFG_NAND_PARTITION "mtdparts=8000000.nor:1m(boot),-(rootfs)\\\\;gpmi-nand:64m(boot),16m(kernel),16m(dtb),-(rootfs) "
25 25 #else
26 26 #define CONFIG_MFG_NAND_PARTITION ""
27 27 #endif
include/configs/mx6sabre_common.h
Diff comments   View file @ 306ab0d
... ... @@ -99,7 +99,7 @@
99 99 #define CONFIG_SYS_MMC_IMG_LOAD_PART 1
100 100  
101 101 #ifdef CONFIG_SYS_BOOT_NAND
102   -#define CONFIG_MFG_NAND_PARTITION "mtdparts=gpmi-nand:16m(boot),16m(kernel),16m(dtb),-(rootfs) "
  102 +#define CONFIG_MFG_NAND_PARTITION "mtdparts=gpmi-nand:64m(boot),16m(kernel),16m(dtb),-(rootfs) "
103 103 #else
104 104 #define CONFIG_MFG_NAND_PARTITION ""
105 105 #endif
... ... @@ -132,7 +132,7 @@
132 132 "fdt_high=0xffffffff\0" \
133 133 "bootargs=console=" CONFIG_CONSOLE_DEV ",115200 ubi.mtd=4 " \
134 134 "root=ubi0:rootfs rootfstype=ubifs " \
135   - "mtdparts=gpmi-nand:16m(boot),16m(kernel),16m(dtb),-(rootfs)m(boot),16m(kernel),16m(dtb),-(rootfs)\0"\"\
  135 + "mtdparts=gpmi-nand:64m(boot),16m(kernel),16m(dtb),-(rootfs)m(boot),16m(kernel),16m(dtb),-(rootfs)\0"\"\
136 136 "bootcmd=nand read ${loadaddr} 0x1000000 0x800000;"\
137 137 "nand read ${fdt_addr} 0x2000000 0x100000;"\
138 138 "bootz ${loadaddr} - ${fdt_addr}\0"
include/configs/mx6sx_arm2.h
Diff comments   View file @ 306ab0d
... ... @@ -143,7 +143,7 @@
143 143  
144 144 #define CONFIG_SYS_MMC_IMG_LOAD_PART 1
145 145 #ifdef CONFIG_SYS_BOOT_NAND
146   -#define CONFIG_MFG_NAND_PARTITION "mtdparts=gpmi-nand:16m(boot),16m(kernel),16m(dtb),-(rootfs) "
  146 +#define CONFIG_MFG_NAND_PARTITION "mtdparts=gpmi-nand:64m(boot),16m(kernel),16m(dtb),-(rootfs) "
147 147 #else
148 148 #define CONFIG_MFG_NAND_PARTITION ""
149 149 #endif
... ... @@ -176,7 +176,7 @@
176 176 "console=ttymxc0\0" \
177 177 "bootargs=console=ttymxc0,115200 ubi.mtd=3 " \
178 178 "root=ubi0:rootfs rootfstype=ubifs " \
179   - "mtdparts=gpmi-nand:16m(boot),16m(kernel),16m(dtb),-(rootfs)m(boot),16m(kernel),16m(dtb),-(rootfs)\0"\"\
  179 + "mtdparts=gpmi-nand:64m(boot),16m(kernel),16m(dtb),-(rootfs)m(boot),16m(kernel),16m(dtb),-(rootfs)\0"\"\
180 180 "bootcmd=nand read ${loadaddr} 0x1000000 0x800000;"\
181 181 "nand read ${fdt_addr} 0x2000000 0x100000;"\
182 182 "bootz ${loadaddr} - ${fdt_addr}\0"
include/configs/mx6sxsabreauto.h
Diff comments   View file @ 306ab0d
... ... @@ -160,7 +160,7 @@
160 160 #endif
161 161  
162 162 #ifdef CONFIG_SYS_BOOT_NAND
163   -#define CONFIG_MFG_NAND_PARTITION "mtdparts=gpmi-nand:16m(boot),16m(kernel),16m(dtb),-(rootfs) "
  163 +#define CONFIG_MFG_NAND_PARTITION "mtdparts=gpmi-nand:64m(boot),16m(kernel),16m(dtb),-(rootfs) "
164 164 #else
165 165 #define CONFIG_MFG_NAND_PARTITION ""
166 166 #endif
... ... @@ -186,7 +186,7 @@
186 186 "console=ttymxc0\0" \
187 187 "bootargs=console=ttymxc0,115200 ubi.mtd=5 " \
188 188 "root=ubi0:rootfs rootfstype=ubifs " \
189   - "mtdparts=gpmi-nand:16m(boot),16m(kernel),16m(dtb),-(rootfs)m(boot),16m(kernel),16m(dtb),-(rootfs)\0"\"\
  189 + "mtdparts=gpmi-nand:64m(boot),16m(kernel),16m(dtb),-(rootfs)m(boot),16m(kernel),16m(dtb),-(rootfs)\0"\"\
190 190 "bootcmd=nand read ${loadaddr} 0x1000000 0x800000;"\
191 191 "nand read ${fdt_addr} 0x2000000 0x100000;"\
192 192 "bootz ${loadaddr} - ${fdt_addr}\0"