mirror of
https://github.com/u-boot/u-boot.git
synced 2024-11-26 21:54:37 +08:00
Merge branch '2019-07-31-ti-imports'
- Various DaVinci fixes - Migrate am335x_boneblack_vboot to use more DM drivers - Keystone updates
This commit is contained in:
commit
08c41ca1ef
@ -16,6 +16,10 @@
|
||||
};
|
||||
};
|
||||
|
||||
ð0 {
|
||||
pinctrl-0 = <&mii_pins>, <&mdio_pins>;
|
||||
};
|
||||
|
||||
&flash {
|
||||
compatible = "m25p64", "jedec,spi-nor";
|
||||
};
|
||||
|
@ -98,7 +98,7 @@
|
||||
dma-coherent;
|
||||
clocks = <&k3_clks 5 10>;
|
||||
clock-names = "fck";
|
||||
power-domains = <&k3_pds 5>;
|
||||
power-domains = <&k3_pds 5 TI_SCI_PD_EXCLUSIVE>;
|
||||
ti,psil-base = <0x7000>;
|
||||
|
||||
dmas = <&mcu_udmap &mcu_cpsw 0 UDMA_DIR_TX>,
|
||||
|
@ -129,12 +129,25 @@ static inline void omap_set_fastboot_userdata_size(void)
|
||||
{
|
||||
}
|
||||
#endif /* CONFIG_FASTBOOT_FLASH_MMC */
|
||||
|
||||
static void omap_set_fastboot_product(void)
|
||||
{
|
||||
const char *board_name;
|
||||
|
||||
board_name = env_get("board_name");
|
||||
if (board_name == NULL)
|
||||
printf("Warning: fastboot.product: unknown board\n");
|
||||
|
||||
env_set("fastboot.product", board_name);
|
||||
}
|
||||
|
||||
void omap_set_fastboot_vars(void)
|
||||
{
|
||||
omap_set_fastboot_cpu();
|
||||
omap_set_fastboot_secure();
|
||||
omap_set_fastboot_board_rev();
|
||||
omap_set_fastboot_userdata_size();
|
||||
omap_set_fastboot_product();
|
||||
}
|
||||
#endif /* CONFIG_FASTBOOT_FLASH */
|
||||
|
||||
|
@ -215,29 +215,21 @@ static const struct pinmux_config gpio_pins[] = {
|
||||
};
|
||||
|
||||
const struct pinmux_resource pinmuxes[] = {
|
||||
#ifndef CONFIG_SPL_BUILD
|
||||
#ifdef CONFIG_DRIVER_TI_EMAC
|
||||
PINMUX_ITEM(emac_pins_mdio),
|
||||
#ifdef CONFIG_DRIVER_TI_EMAC_USE_RMII
|
||||
PINMUX_ITEM(emac_pins_rmii),
|
||||
#else
|
||||
PINMUX_ITEM(emac_pins_mii),
|
||||
#endif /* CONFIG_DRIVER_TI_EMAC */
|
||||
#endif /* CONFIG_DRIVER_TI_EMAC_USE_RMII */
|
||||
#endif /* CONFIG_SPL_BUILD */
|
||||
#endif
|
||||
#endif
|
||||
#ifdef CONFIG_SPI_FLASH
|
||||
#if !CONFIG_IS_ENABLED(PINCTRL)
|
||||
PINMUX_ITEM(spi1_pins_base),
|
||||
PINMUX_ITEM(spi1_pins_scs0),
|
||||
#endif
|
||||
#endif
|
||||
#if !CONFIG_IS_ENABLED(PINCTRL)
|
||||
PINMUX_ITEM(uart2_pins_txrx),
|
||||
PINMUX_ITEM(uart2_pins_rtscts),
|
||||
#endif
|
||||
#if !CONFIG_IS_ENABLED(PINCTRL)
|
||||
PINMUX_ITEM(i2c0_pins),
|
||||
#endif
|
||||
#ifdef CONFIG_NAND_DAVINCI
|
||||
PINMUX_ITEM(emifa_pins_cs3),
|
||||
PINMUX_ITEM(emifa_pins_cs4),
|
||||
@ -248,10 +240,8 @@ const struct pinmux_resource pinmuxes[] = {
|
||||
#endif
|
||||
PINMUX_ITEM(gpio_pins),
|
||||
#ifdef CONFIG_MMC_DAVINCI
|
||||
#if !CONFIG_IS_ENABLED(PINCTRL)
|
||||
PINMUX_ITEM(mmc0_pins),
|
||||
#endif
|
||||
#endif
|
||||
};
|
||||
|
||||
const int pinmuxes_size = ARRAY_SIZE(pinmuxes);
|
||||
@ -300,9 +290,6 @@ u32 get_board_rev(void)
|
||||
rev = 2;
|
||||
else if (maxcpuclk >= 372000000)
|
||||
rev = 1;
|
||||
#ifdef CONFIG_DA850_AM18X_EVM
|
||||
rev |= REV_AM18X_EVM;
|
||||
#endif
|
||||
return rev;
|
||||
}
|
||||
|
||||
|
@ -33,7 +33,7 @@ CONFIG_OF_CONTROL=y
|
||||
CONFIG_DEFAULT_DEVICE_TREE="am335x-boneblack"
|
||||
CONFIG_ENV_IS_IN_MMC=y
|
||||
CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
|
||||
# CONFIG_BLK is not set
|
||||
# CONFIG_SPL_BLK is not set
|
||||
CONFIG_BOOTCOUNT_LIMIT=y
|
||||
CONFIG_DFU_MMC=y
|
||||
CONFIG_DFU_RAM=y
|
||||
@ -42,6 +42,8 @@ CONFIG_DM_I2C=y
|
||||
CONFIG_MISC=y
|
||||
CONFIG_DM_MMC=y
|
||||
CONFIG_MMC_OMAP_HS=y
|
||||
# CONFIG_SPL_DM_MMC is not set
|
||||
CONFIG_DM_SPI_FLASH=y
|
||||
CONFIG_SPI_FLASH=y
|
||||
CONFIG_SF_DEFAULT_SPEED=24000000
|
||||
CONFIG_SPI_FLASH_WINBOND=y
|
||||
@ -50,6 +52,7 @@ CONFIG_PHY_GIGE=y
|
||||
CONFIG_MII=y
|
||||
CONFIG_DRIVER_TI_CPSW=y
|
||||
CONFIG_SPI=y
|
||||
CONFIG_DM_SPI=y
|
||||
CONFIG_OMAP3_SPI=y
|
||||
CONFIG_TIMER=y
|
||||
CONFIG_OMAP_TIMER=y
|
||||
|
@ -28,7 +28,9 @@ CONFIG_SPL_DMA_SUPPORT=y
|
||||
CONFIG_SPL_OS_BOOT=y
|
||||
CONFIG_SPL_SPI_LOAD=y
|
||||
CONFIG_SPL_YMODEM_SUPPORT=y
|
||||
CONFIG_CMD_DTIMG=y
|
||||
CONFIG_CMD_SPL=y
|
||||
CONFIG_CMD_BCB=y
|
||||
# CONFIG_CMD_FLASH is not set
|
||||
# CONFIG_CMD_SETEXPR is not set
|
||||
# CONFIG_CMD_PMIC is not set
|
||||
|
@ -31,6 +31,8 @@ CONFIG_SPL_SEPARATE_BSS=y
|
||||
CONFIG_SPL_DMA_SUPPORT=y
|
||||
# CONFIG_SPL_NAND_SUPPORT is not set
|
||||
CONFIG_SPL_SPI_LOAD=y
|
||||
CONFIG_CMD_DTIMG=y
|
||||
CONFIG_CMD_BCB=y
|
||||
# CONFIG_CMD_FLASH is not set
|
||||
# CONFIG_CMD_SETEXPR is not set
|
||||
# CONFIG_CMD_PMIC is not set
|
||||
|
@ -36,6 +36,8 @@ CONFIG_SPL_SPI_LOAD=y
|
||||
CONFIG_SPL_USB_GADGET=y
|
||||
CONFIG_SPL_DFU=y
|
||||
CONFIG_SPL_YMODEM_SUPPORT=y
|
||||
CONFIG_CMD_DTIMG=y
|
||||
CONFIG_CMD_BCB=y
|
||||
# CONFIG_CMD_FLASH is not set
|
||||
# CONFIG_CMD_SETEXPR is not set
|
||||
# CONFIG_CMD_PMIC is not set
|
||||
|
@ -28,14 +28,12 @@ CONFIG_SPL_I2C_SUPPORT=y
|
||||
CONFIG_SPL_DM_MAILBOX=y
|
||||
CONFIG_SPL_DM_RESET=y
|
||||
CONFIG_SPL_POWER_DOMAIN=y
|
||||
CONFIG_SPL_REMOTEPROC=y
|
||||
CONFIG_SPL_YMODEM_SUPPORT=y
|
||||
CONFIG_CMD_ASKENV=y
|
||||
# CONFIG_CMD_FLASH is not set
|
||||
CONFIG_CMD_GPT=y
|
||||
CONFIG_CMD_I2C=y
|
||||
CONFIG_CMD_MMC=y
|
||||
CONFIG_CMD_REMOTEPROC=y
|
||||
# CONFIG_CMD_SETEXPR is not set
|
||||
CONFIG_CMD_TIME=y
|
||||
# CONFIG_ISO_PARTITION is not set
|
||||
@ -79,7 +77,6 @@ CONFIG_SPL_PINCTRL=y
|
||||
CONFIG_PINCTRL_SINGLE=y
|
||||
CONFIG_POWER_DOMAIN=y
|
||||
CONFIG_TI_SCI_POWER_DOMAIN=y
|
||||
CONFIG_K3_SYSTEM_CONTROLLER=y
|
||||
CONFIG_DM_RESET=y
|
||||
CONFIG_RESET_TI_SCI=y
|
||||
CONFIG_DM_SERIAL=y
|
||||
|
@ -31,13 +31,11 @@ CONFIG_SPL_I2C_SUPPORT=y
|
||||
CONFIG_SPL_DM_MAILBOX=y
|
||||
CONFIG_SPL_DM_RESET=y
|
||||
CONFIG_SPL_POWER_DOMAIN=y
|
||||
CONFIG_SPL_REMOTEPROC=y
|
||||
CONFIG_SPL_YMODEM_SUPPORT=y
|
||||
CONFIG_CMD_ASKENV=y
|
||||
# CONFIG_CMD_FLASH is not set
|
||||
CONFIG_CMD_I2C=y
|
||||
CONFIG_CMD_MMC=y
|
||||
CONFIG_CMD_REMOTEPROC=y
|
||||
# CONFIG_CMD_SETEXPR is not set
|
||||
CONFIG_CMD_TIME=y
|
||||
# CONFIG_ISO_PARTITION is not set
|
||||
@ -76,7 +74,6 @@ CONFIG_SPL_PINCTRL=y
|
||||
CONFIG_PINCTRL_SINGLE=y
|
||||
CONFIG_POWER_DOMAIN=y
|
||||
CONFIG_TI_SCI_POWER_DOMAIN=y
|
||||
CONFIG_K3_SYSTEM_CONTROLLER=y
|
||||
CONFIG_DM_RESET=y
|
||||
CONFIG_RESET_TI_SCI=y
|
||||
CONFIG_DM_SERIAL=y
|
||||
|
@ -30,13 +30,15 @@ CONFIG_CRC32_VERIFY=y
|
||||
CONFIG_CMD_DM=y
|
||||
# CONFIG_CMD_FLASH is not set
|
||||
# CONFIG_CMD_GPT is not set
|
||||
CONFIG_CMD_MTD=y
|
||||
# CONFIG_CMD_SF is not set
|
||||
# CONFIG_CMD_SETEXPR is not set
|
||||
# CONFIG_CMD_TIME is not set
|
||||
# CONFIG_CMD_EXT4 is not set
|
||||
CONFIG_CMD_FS_UUID=y
|
||||
CONFIG_CMD_MTDPARTS=y
|
||||
CONFIG_MTDIDS_DEFAULT="nor0=spi0.0"
|
||||
CONFIG_MTDPARTS_DEFAULT="mtdparts=spi0.0:512k(u-boot.ais),64k(u-boot-env),7552k(kernel-spare),64k(MAC-Address)"
|
||||
CONFIG_MTDPARTS_DEFAULT="mtdparts=spi0.0:32k(SPL),480k(u-boot),64k(u-boot-env),7552k(kernel-spare),64k(MAC-Address)"
|
||||
CONFIG_CMD_DIAG=y
|
||||
CONFIG_OF_CONTROL=y
|
||||
CONFIG_SPL_OF_CONTROL=y
|
||||
@ -77,4 +79,3 @@ CONFIG_USB_OHCI_HCD=y
|
||||
CONFIG_USB_OHCI_DA8XX=y
|
||||
CONFIG_USB_STORAGE=y
|
||||
# CONFIG_FAT_WRITE is not set
|
||||
CONFIG_USE_TINY_PRINTF=y
|
||||
|
@ -28,13 +28,11 @@ CONFIG_SPL_DM_MAILBOX=y
|
||||
CONFIG_SPL_DM_RESET=y
|
||||
CONFIG_SPL_POWER_SUPPORT=y
|
||||
CONFIG_SPL_POWER_DOMAIN=y
|
||||
CONFIG_SPL_REMOTEPROC=y
|
||||
CONFIG_SPL_SPI_LOAD=y
|
||||
CONFIG_SPL_YMODEM_SUPPORT=y
|
||||
CONFIG_CMD_ASKENV=y
|
||||
# CONFIG_CMD_FLASH is not set
|
||||
CONFIG_CMD_MMC=y
|
||||
CONFIG_CMD_REMOTEPROC=y
|
||||
CONFIG_CMD_SF=y
|
||||
# CONFIG_CMD_SETEXPR is not set
|
||||
CONFIG_CMD_TIME=y
|
||||
@ -73,7 +71,6 @@ CONFIG_SPL_PINCTRL=y
|
||||
CONFIG_PINCTRL_SINGLE=y
|
||||
CONFIG_POWER_DOMAIN=y
|
||||
CONFIG_TI_SCI_POWER_DOMAIN=y
|
||||
CONFIG_K3_SYSTEM_CONTROLLER=y
|
||||
CONFIG_DM_RESET=y
|
||||
CONFIG_RESET_TI_SCI=y
|
||||
CONFIG_DM_SERIAL=y
|
||||
|
@ -739,8 +739,8 @@ static void davinci_nand_init(struct nand_chip *nand)
|
||||
|
||||
layout = &nand_keystone_rbl_4bit_layout_oobfirst;
|
||||
layout->oobavail = 0;
|
||||
for (i = 0; layout->oobfree[i].length &&
|
||||
i < ARRAY_SIZE(layout->oobfree); i++)
|
||||
for (i = 0; i < ARRAY_SIZE(layout->oobfree) &&
|
||||
layout->oobfree[i].length; i++)
|
||||
layout->oobavail += layout->oobfree[i].length;
|
||||
|
||||
nand->write_page = nand_davinci_write_page;
|
||||
|
@ -98,6 +98,10 @@
|
||||
#define AB_SELECT ""
|
||||
#endif
|
||||
|
||||
#define FASTBOOT_CMD \
|
||||
"echo Booting into fastboot ...; " \
|
||||
"fastboot " __stringify(CONFIG_FASTBOOT_USB_DEV) "; "
|
||||
|
||||
#define DEFAULT_COMMON_BOOT_TI_ARGS \
|
||||
"console=" CONSOLEDEV ",115200n8\0" \
|
||||
"fdtfile=undefined\0" \
|
||||
@ -117,6 +121,28 @@
|
||||
"setenv mmcroot /dev/mmcblk0p2 rw; " \
|
||||
"run mmcboot;\0" \
|
||||
"emmc_android_boot=" \
|
||||
"if bcb load " __stringify(CONFIG_FASTBOOT_FLASH_MMC_DEV) " " \
|
||||
CONTROL_PARTITION "; then " \
|
||||
"if bcb test command = bootonce-bootloader; then " \
|
||||
"echo BCB: Bootloader boot...; " \
|
||||
"bcb clear command; bcb store; " \
|
||||
FASTBOOT_CMD \
|
||||
"elif bcb test command = boot-recovery; then " \
|
||||
"echo BCB: Recovery boot...; " \
|
||||
"echo Warning: recovery is not implemented; " \
|
||||
"echo Performing normal boot for now...; " \
|
||||
"bcb clear command; bcb store; " \
|
||||
"run emmc_android_normal_boot; " \
|
||||
"else " \
|
||||
"echo BCB: Normal boot requested...; " \
|
||||
"run emmc_android_normal_boot; " \
|
||||
"fi; " \
|
||||
"else " \
|
||||
"echo Warning: BCB is corrupted or does not exist; " \
|
||||
"echo Performing normal boot...; " \
|
||||
"run emmc_android_normal_boot; " \
|
||||
"fi;\0" \
|
||||
"emmc_android_normal_boot=" \
|
||||
"echo Trying to boot Android from eMMC ...; " \
|
||||
"run update_to_fit; " \
|
||||
"setenv eval_bootargs setenv bootargs $bootargs; " \
|
||||
@ -176,8 +202,7 @@
|
||||
"if test ${dofastboot} -eq 1; then " \
|
||||
"echo Boot fastboot requested, resetting dofastboot ...;" \
|
||||
"setenv dofastboot 0; saveenv;" \
|
||||
"echo Booting into fastboot ...; " \
|
||||
"fastboot " __stringify(CONFIG_FASTBOOT_USB_DEV) "; " \
|
||||
FASTBOOT_CMD \
|
||||
"fi;" \
|
||||
"if test ${boot_fit} -eq 1; then " \
|
||||
"run update_to_fit;" \
|
||||
|
@ -280,7 +280,6 @@ CONFIG_CTL_JTAG
|
||||
CONFIG_CTL_TBE
|
||||
CONFIG_CUSTOMER_BOARD_SUPPORT
|
||||
CONFIG_D2NET_V2
|
||||
CONFIG_DA850_AM18X_EVM
|
||||
CONFIG_DA850_EVM_MAX_CPU_CLK
|
||||
CONFIG_DBGU
|
||||
CONFIG_DB_784MP_GP
|
||||
|
Loading…
Reference in New Issue
Block a user