summaryrefslogtreecommitdiff
path: root/include/configs
diff options
context:
space:
mode:
authorvojo <joris.van.vossen@sintecs.nl>2018-01-17 16:19:55 (GMT)
committervojo <joris.van.vossen@sintecs.nl>2018-01-17 16:19:55 (GMT)
commitb07fac8eed8edd5866cb67d5a653599ca5c7b877 (patch)
tree010c817e281a4cbd68af01492c3e1907d83c49b0 /include/configs
parent4041abe76723c4dc98f32d0eac935636b3ae65da (diff)
downloadu-boot-b07fac8eed8edd5866cb67d5a653599ca5c7b877.tar.xz
clean-up and variable update
Diffstat (limited to 'include/configs')
-rw-r--r--include/configs/grapeboard.h28
1 files changed, 11 insertions, 17 deletions
diff --git a/include/configs/grapeboard.h b/include/configs/grapeboard.h
index 78b5447..509395f 100644
--- a/include/configs/grapeboard.h
+++ b/include/configs/grapeboard.h
@@ -136,7 +136,7 @@
/* PFE Ethernet */
#ifdef CONFIG_FSL_PFE
-#define EMAC1_PHY_ADDR 0x0 /* may be changed to 1 because of possible bug */
+#define EMAC1_PHY_ADDR 0x0 /* will be changed to address 1 in final version */
#define EMAC2_PHY_ADDR 0x2
#endif
@@ -251,32 +251,26 @@
"dhcp;" \
"tftp $load_addr $tftp_path/u-boot-pbl.bin;" \
"if test $? = \"0\"; then " \
- "run update_pbl_uboot_qspi_nor;" \
+ "sf probe 0:0;" \
+ "sf erase 0 200000;" \
+ "sf write $load_addr 0 $filesize;" \
"fi\0" \
"tftp_update_ppa_qspi_nor=" \
"dhcp;" \
"tftp $load_addr $tftp_path/ppa.itb;" \
"if test $? = \"0\"; then " \
- "run update_ppa_qspi_nor;" \
+ "sf probe 0:0;" \
+ "sf erase 240000 40000;" \
+ "sf write $load_addr 240000 $filesize;" \
"fi\0" \
"tftp_update_pfe_qspi_nor=" \
"dhcp;" \
"tftp $load_addr $tftp_path/pfe_fw_sbl.itb;" \
"if test $? = \"0\"; then " \
- "run update_pfe_qspi_nor;" \
+ "sf probe 0:0;" \
+ "sf erase 280000 40000;" \
+ "sf write $load_addr 280000 $filesize;" \
"fi\0" \
- "update_pbl_uboot_qspi_nor=" \
- "sf probe 0:0;" \
- "sf erase 0 200000;" \
- "sf write $load_addr 0 $filesize\0" \
- "update_ppa_qspi_nor=" \
- "sf probe 0:0;" \
- "sf erase 240000 40000;" \
- "sf write $load_addr 240000 $filesize\0" \
- "update_pfe_qspi_nor=" \
- "sf probe 0:0;" \
- "sf erase 280000 40000;" \
- "sf write $load_addr 280000 $filesize\0" \
"mmcboot=" \
"ext4load mmc 0:1 $fdt_addr_r /boot/grapeboard.dtb;" \
"ext4load mmc 0:1 $kernel_addr_r /boot/uImage;" \
@@ -297,7 +291,7 @@
#if defined(CONFIG_QSPI_BOOT) || defined(CONFIG_SD_BOOT_QSPI)
#define CONFIG_BOOTCOMMAND "run mmcboot"
#endif
-#define CONFIG_BOOTARGS "console=ttyS0,115200 root=/dev/mmcblk0p1 rootfstype=ext4 rw " \
+#define CONFIG_BOOTARGS "console=ttyS0,115200 root=/dev/mmcblk0p1 rootfstype=ext4 rw rootwait" \
"earlycon=uart8250,mmio,0x21c0500 quiet lpj=250000 noinitrd"
#endif