hw16: Make compatible with ostree

This commit is contained in:
Alexandre Bard 2019-04-15 17:13:58 +02:00
parent 1862aa951b
commit baa5e4fcea
1 changed files with 7 additions and 3 deletions

View File

@ -46,7 +46,7 @@
#define CONFIG_BOOTP_MAY_FAIL #define CONFIG_BOOTP_MAY_FAIL
#ifndef CONFIG_SPL_BUILD #ifndef CONFIG_SPL_BUILD
#define KERNEL_ADDR "0x80000000" #define KERNEL_ADDR "0x8C100000"
#define LOAD_ADDR "0x83000000" #define LOAD_ADDR "0x83000000"
#define FDT_ADDR "0x82000000" #define FDT_ADDR "0x82000000"
#define PXE_ADDR "0x82800000" #define PXE_ADDR "0x82800000"
@ -72,7 +72,7 @@
"else run sdbringup; fi; " \ "else run sdbringup; fi; " \
"run add_sd_bootargs; run add_version_bootargs; run shieldcmd; run modifyfdtcmd; " \ "run add_sd_bootargs; run add_version_bootargs; run shieldcmd; run modifyfdtcmd; " \
"bootz $kernel_addr - $fdt_addr; fi\0" \ "bootz $kernel_addr - $fdt_addr; fi\0" \
"bootcmd=run sdboot\0" \ "bootcmd=run bootcmd_otenv; run bootcmd_rd_in_mmc\0" \
"ipaddr=192.168.1.1\0" \ "ipaddr=192.168.1.1\0" \
"serverip=192.168.1.254\0" \ "serverip=192.168.1.254\0" \
"pxefile_addr_r=" PXE_ADDR "\0" \ "pxefile_addr_r=" PXE_ADDR "\0" \
@ -89,7 +89,11 @@
"modifyfdtcmd=fdt addr $fdt_addr; run fdtshieldcmd;\0" \ "modifyfdtcmd=fdt addr $fdt_addr; run fdtshieldcmd;\0" \
"tftp_recovery=tftpboot $kernel_addr recovery-image; tftpboot $fdt_addr recovery-dtb; setenv bootargs rdinit=/etc/preinit console=$defaultconsole,115200 debug; run shieldcmd; run modifyfdtcmd; bootz $kernel_addr - $fdt_addr\0" \ "tftp_recovery=tftpboot $kernel_addr recovery-image; tftpboot $fdt_addr recovery-dtb; setenv bootargs rdinit=/etc/preinit console=$defaultconsole,115200 debug; run shieldcmd; run modifyfdtcmd; bootz $kernel_addr - $fdt_addr\0" \
"pxe_recovery=sleep 3 && dhcp && pxe get && pxe boot\0" \ "pxe_recovery=sleep 3 && dhcp && pxe get && pxe boot\0" \
"recovery=run pxe_recovery || setenv ipaddr $ipaddr; setenv serverip $serverip; run tftp_recovery\0" /* setenv ipaddr and serverip is necessary, because dhclient can destroy the IPs inernally */ "recovery=run pxe_recovery || setenv ipaddr $ipaddr; setenv serverip $serverip; run tftp_recovery\0" /* setenv ipaddr and serverip is necessary, because dhclient can destroy the IPs inernally */ \
"bootcmd_otenv=ext4load mmc 1:1 $load_addr /boot/loader/uEnv.txt; env import -t $load_addr $filesize; setenv bootargs $bootargs root=/dev/ram0 console=$defaultconsole,115200 rw ostree_root=/dev/mmcblk1p1\0" \
"bootcmd_rd_in_mmc=ext4load mmc 1:1 $kernel_addr_r /boot$kernel_image; bootm $kernel_addr_r#conf@am335x-nrhw16-prod4.dtb\0" \
"fdt_high=0xffffffff\0" \
"initrd_high=0xffffffff\0"
#endif #endif