diff options
Diffstat (limited to 'include/configs/grapeboard.h')
| -rw-r--r-- | include/configs/grapeboard.h | 137 |
1 files changed, 88 insertions, 49 deletions
diff --git a/include/configs/grapeboard.h b/include/configs/grapeboard.h index 6b78c81..c1149f6 100644 --- a/include/configs/grapeboard.h +++ b/include/configs/grapeboard.h @@ -22,6 +22,7 @@ #define CONFIG_BOARD_LATE_INIT #define CONFIG_DISPLAY_BOARDINFO_LATE +#define CONFIG_MISC_INIT_R /* Match the following u-boot offsets with the value in the PBI instructions! */ #define CONFIG_U_BOOT_PAD_TO 0x1000 @@ -71,17 +72,21 @@ #define CONFIG_FSL_QSPI #define QSPI0_AMBA_BASE 0x40000000 #define CONFIG_SPI_FLASH_SPANSION +#define CONFIG_SPI_FLASH_SST /* Standard flash */ #define FSL_QSPI_FLASH_SIZE SZ_64M #define FSL_QSPI_FLASH_NUM 1 /* QSPI Environment */ +#define CONFIG_ENV_SIZE 0x40000 /* 256KB */ + #if CONFIG_RESCUE_UBOOT_CONFIG +/* Rescue flash size is at minimum 1MBytes. + * I.e. PBL/U-boot/PPA/PFE/BCD must fit within 0x100000. */ #define CONFIG_ENV_IS_NOWHERE #else #define CONFIG_ENV_OVERWRITE #define CONFIG_ENV_IS_IN_SPI_FLASH -#define CONFIG_ENV_SIZE 0x40000 /* 256KB */ #define CONFIG_ENV_OFFSET 0x200000 /* 2MB */ #define CONFIG_ENV_SECT_SIZE 0x40000 #endif @@ -140,27 +145,11 @@ #define EMAC2_PHY_ADDR 0x2 #endif -/* -* USB -*/ -/* EHCI Support - disbaled by default */ -/*#define CONFIG_HAS_FSL_DR_USB*/ - -#ifdef CONFIG_HAS_FSL_DR_USB -#define CONFIG_USB_EHCI_FSL -#define CONFIG_USB_ULPI -#define CONFIG_USB_ULPI_VIEWPORT -#define CONFIG_USB_EHCI_HCD -#define CONFIG_EHCI_HCD_INIT_AFTER_RESET -#endif - /* USB XHCI */ -/* todo: fix hx3 hub configuration errors */ #define CONFIG_HAS_FSL_XHCI_USB #ifdef CONFIG_HAS_FSL_XHCI_USB #define CONFIG_USB_XHCI_FSL -/*#define CONFIG_USB_XHCI_PCI*/ #define CONFIG_USB_MAX_CONTROLLER_COUNT 1 #endif @@ -187,27 +176,23 @@ #define CONFIG_PCI_SCAN_SHOW #define CONFIG_CMD_PCI -#if 0 /* todo */ /* Mtdparts configuration */ #define CONFIG_MTD_DEVICE #define CONFIG_MTD_PARTITIONS -/*#define CONFIG_CMD_MTDPARTS*/ +#define CONFIG_CMD_MTDPARTS #define CONFIG_USE_SPIFLASH +#define CONFIG_SPI_FLASH_MTD #define MTDIDS_DEFAULT \ - "nor0=spi40000000.0" - -#define MTDPART_DEFAULT_PARTITIONS \ - "2M@0x0(u-boot)," \ - "256k(env)," \ - "256k(ppa)," \ - "256k(pfe_ucode)," + "nor0=qspi@40000000.0" #define MTDPARTS_DEFAULT \ - "mtdparts=spi40000000.0:" \ - MTDPART_DEFAULT_PARTITIONS \ + "mtdparts=qspi@40000000.0:" \ + "2M@0x0(u-boot)," \ + "256k(env)," \ + "256k(ppa)," \ + "256k(pfe_ucode)," \ "-(rootfs)" -#endif /* Default environment variables */ #define COMMON_UBOOT_CONFIG \ @@ -232,22 +217,7 @@ "eth1addr=02:00:00:ba:be:02\0" \ "tftp_path=.\0" \ "autoload=no\0" \ - -/* Default flash specific environment variables */ -#if CONFIG_RESCUE_UBOOT_CONFIG -#define CONFIG_EXTRA_ENV_SETTINGS \ - COMMON_UBOOT_CONFIG - /* todo: add recovery variables */ -#undef CONFIG_BOOTCOMMAND -#if defined(CONFIG_QSPI_BOOT) || defined(CONFIG_SD_BOOT_QSPI) -/* recover from sd card */ -#define CONFIG_BOOTCOMMAND "test" -#endif - -#else /* if CONFIG_STANDARD_UBOOT_CONFIG */ -#define CONFIG_EXTRA_ENV_SETTINGS \ - COMMON_UBOOT_CONFIG \ - "tftp_update_pbl_uboot_qspi_nor=" \ + "update_tftp_uboot_pbl_qspi_nor=" \ "dhcp;" \ "tftp $load_addr $tftp_path/u-boot-pbl.bin;" \ "if test $? = \"0\"; then " \ @@ -255,7 +225,7 @@ "sf erase 0 200000;" \ "sf write $load_addr 0 $filesize;" \ "fi\0" \ - "tftp_update_ppa_qspi_nor=" \ + "update_tftp_ppa_qspi_nor=" \ "dhcp;" \ "tftp $load_addr $tftp_path/ppa.itb;" \ "if test $? = \"0\"; then " \ @@ -263,7 +233,7 @@ "sf erase 240000 40000;" \ "sf write $load_addr 240000 $filesize;" \ "fi\0" \ - "tftp_update_pfe_qspi_nor=" \ + "update_tftp_pfe_qspi_nor=" \ "dhcp;" \ "tftp $load_addr $tftp_path/pfe_fw_sbl.itb;" \ "if test $? = \"0\"; then " \ @@ -271,6 +241,68 @@ "sf erase 280000 40000;" \ "sf write $load_addr 280000 $filesize;" \ "fi\0" \ + "update_usb_uboot_pbl_qspi_nor=" \ + "usb start;" \ + "fatload usb 0:1 $load_addr u-boot-pbl.bin;" \ + "if test $? = \"0\"; then " \ + "sf probe 0:0;" \ + "sf erase 0 200000;" \ + "sf write $load_addr 0 $filesize;" \ + "fi\0" \ + "update_usb_ppa_qspi_nor=" \ + "usb start;" \ + "fatload usb 0:1 $load_addr ppa.itb;" \ + "if test $? = \"0\"; then " \ + "sf probe 0:0;" \ + "sf erase 240000 40000;" \ + "sf write $load_addr 240000 $filesize;" \ + "fi\0" \ + "update_usb_pfe_qspi_nor=" \ + "usb start;" \ + "fatload usb 0:1 $load_addr pfe_fw_sbl.itb;" \ + "if test $? = \"0\"; then " \ + "sf probe 0:0;" \ + "sf erase 280000 40000;" \ + "sf write $load_addr 280000 $filesize;" \ + "fi\0" \ + "update_mmc_uboot_pbl_qspi_nor=" \ + "mmc rescan;" \ + "ext4load mmc 0:1 $load_addr /boot/u-boot-pbl.bin;" \ + "if test $? = \"0\"; then " \ + "sf probe 0:0;" \ + "sf erase 0 200000;" \ + "sf write $load_addr 0 $filesize;" \ + "fi\0" \ + "update_mmc_ppa_qspi_nor=" \ + "mmc rescan;" \ + "ext4load mmc 0:1 $load_addr /boot/ppa.itb;" \ + "if test $? = \"0\"; then " \ + "sf probe 0:0;" \ + "sf erase 240000 40000;" \ + "sf write $load_addr 240000 $filesize;" \ + "fi\0" \ + "update_mmc_pfe_qspi_nor=" \ + "mmc rescan;" \ + "ext4load mmc 0:1 $load_addr /boot/pfe_fw_sbl.itb;" \ + "if test $? = \"0\"; then " \ + "sf probe 0:0;" \ + "sf erase 280000 40000;" \ + "sf write $load_addr 280000 $filesize;" \ + "fi\0" \ + +/* Default flash specific environment variables */ +#if CONFIG_RESCUE_UBOOT_CONFIG +#define CONFIG_EXTRA_ENV_SETTINGS \ + COMMON_UBOOT_CONFIG +#undef CONFIG_BOOTCOMMAND +#if defined(CONFIG_QSPI_BOOT) || defined(CONFIG_SD_BOOT_QSPI) +/* recover from sd card */ +#define CONFIG_BOOTCOMMAND "run update_mmc_uboot_pbl_qspi_nor; run update_mmc_pfe_qspi_nor; run update_mmc_ppa_qspi_nor" +#endif + +#else /* if CONFIG_STANDARD_UBOOT_CONFIG */ +#define CONFIG_EXTRA_ENV_SETTINGS \ + COMMON_UBOOT_CONFIG \ "mmcboot=" \ "ext4load mmc 0:1 $fdt_addr_r /boot/grapeboard.dtb;" \ "ext4load mmc 0:1 $kernel_addr_r /boot/uImage;" \ @@ -278,6 +310,13 @@ "pfe stop;" \ "bootm $kernel_addr_r - $fdt_addr_r;" \ "fi\0" \ + "scsiboot=" \ + "ext4load scsi 0:1 $fdt_addr_r /boot/grapeboard.dtb;" \ + "ext4load scsi 0:1 $kernel_addr_r /boot/uImage;" \ + "if test $? = \"0\"; then " \ + "pfe stop;" \ + "bootm $kernel_addr_r - $fdt_addr_r;" \ + "fi\0" \ "netboot=" \ "dhcp;" \ "tftp $fdt_addr_r $tftp_path/grapeboard.dtb;" \ @@ -291,8 +330,8 @@ #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 rootwait" \ - "earlycon=uart8250,mmio,0x21c0500 quiet lpj=250000 noinitrd" +#define CONFIG_BOOTARGS "console=ttyS0,115200 earlycon=uart8250,mmio,0x21c0500 quiet lpj=250000 noinitrd " \ + "root=/dev/mmcblk0p1 rootfstype=ext4 rw rootwait" #endif #include <asm/fsl_secure_boot.h> |