Skip to content

Commit fc825de

Browse files
Merge pull request #10 from Ham22/legacy-boot
pistachio: add legacy boot root
2 parents a78dbae + 5f0808c commit fc825de

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

include/configs/pistachio_bub.h

+6-2
Original file line numberDiff line numberDiff line change
@@ -282,9 +282,12 @@
282282
#define BOOT_ENV_LEGACY \
283283
"fdtaddr=0x0D000000\0"\
284284
"fdtfile="PISTACHIO_BOARD_NAME".dtb\0"\
285-
"legacy_bootfile=uImage\0"
285+
"legacy_bootfile=uImage\0"\
286+
"legacy_nandroot=root=ubi0:rootfs rootfstype=ubifs\0"
286287

287288
#define NAND_BOOTCOMMAND_LEGACY \
289+
"setenv legacy_nandroot ubi.mtd=firmware$boot_partition $legacy_nandroot;"\
290+
"setenv bootargs $console $earlycon $legacy_nandroot $bootextra $mtdparts panic=2;"\
288291
"echo Loading legacy kernel from rootfs... && "\
289292
"ubifsload $loadaddr $bootdir$legacy_bootfile && "\
290293
"ubifsload $fdtaddr $bootdir$fdtfile && "\
@@ -298,7 +301,7 @@
298301
#endif
299302

300303
#define NAND_BOOTCOMMAND \
301-
"setenv nandroot ubi.mtd=firmware$boot_partition;"\
304+
"setenv nandroot ubi.mtd=firmware$boot_partition $nandroot;"\
302305
"setenv bootargs $console $earlycon $nandroot $bootextra $mtdparts panic=2;"\
303306
"echo Attempting to boot from firmware$boot_partition;"\
304307
"ubi part firmware$boot_partition || reset;"\
@@ -342,6 +345,7 @@
342345
"netroot=root=/dev/nfs rootfstype=nfs ip=dhcp\0"\
343346
"usbroot=root=/dev/sda1\0"\
344347
"mmcroot=root=/dev/mmcblk0p1\0"\
348+
"nandroot=\0"\
345349
"usbdev=0\0"\
346350
"mmcdev=0\0"\
347351
"usbboot="INIT_BOOTCOMMAND USB_BOOTCOMMAND FINAL_BOOTCOMMAND"\0"\

0 commit comments

Comments
 (0)