dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-18 09:02:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'u-boot-atmel-2020.10-a' of https://gitlab.denx.de/u-boot/custodians/u-boot-atmel

Browse Source 
First set of u-boot-atmel features for 2020.10 cycle
This commit is contained in:
Tom Rini
2020-07-07 12:55:57 -04:00
parent f8ddd8cbb5 59dab842f9
commit c4df37bfa9
17 changed files with 13 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/Kconfig
View File

@@ -532,6 +532,7 @@ choice
config ARCH_AT91 config ARCH_AT91
bool "Atmel AT91" bool "Atmel AT91"
select SPL_BOARD_INIT if SPL && !TARGET_SMARTWEB select SPL_BOARD_INIT if SPL && !TARGET_SMARTWEB
select SPL_SEPARATE_BSS if SPL
config TARGET_EDB93XX config TARGET_EDB93XX
bool "Support edb93xx" bool "Support edb93xx"

12
arch/arm/dts/sama5d3.dtsi
View File

@@ -1447,37 +1447,37 @@
atmel,nb-banks = <2>; atmel,nb-banks = <2>;
}; };
ep10: endpoint@10 { ep10: endpoint@a {
reg = <10>; reg = <10>;
atmel,fifo-size = <1024>; atmel,fifo-size = <1024>;
atmel,nb-banks = <2>; atmel,nb-banks = <2>;
}; };
ep11: endpoint@11 { ep11: endpoint@b {
reg = <11>; reg = <11>;
atmel,fifo-size = <1024>; atmel,fifo-size = <1024>;
atmel,nb-banks = <2>; atmel,nb-banks = <2>;
}; };
ep12: endpoint@12 { ep12: endpoint@c {
reg = <12>; reg = <12>;
atmel,fifo-size = <1024>; atmel,fifo-size = <1024>;
atmel,nb-banks = <2>; atmel,nb-banks = <2>;
}; };
ep13: endpoint@13 { ep13: endpoint@d {
reg = <13>; reg = <13>;
atmel,fifo-size = <1024>; atmel,fifo-size = <1024>;
atmel,nb-banks = <2>; atmel,nb-banks = <2>;
}; };
ep14: endpoint@14 { ep14: endpoint@e {
reg = <14>; reg = <14>;
atmel,fifo-size = <1024>; atmel,fifo-size = <1024>;
atmel,nb-banks = <2>; atmel,nb-banks = <2>;
}; };
ep15: endpoint@15 { ep15: endpoint@f {
reg = <15>; reg = <15>;
atmel,fifo-size = <1024>; atmel,fifo-size = <1024>;
atmel,nb-banks = <2>; atmel,nb-banks = <2>;

12
arch/arm/dts/sama5d4.dtsi
View File

@@ -212,42 +212,42 @@
atmel,can-isoc; atmel,can-isoc;
}; };
ep10: endpoint@10 { ep10: endpoint@a {
reg = <10>; reg = <10>;
atmel,fifo-size = <1024>; atmel,fifo-size = <1024>;
atmel,nb-banks = <2>; atmel,nb-banks = <2>;
atmel,can-isoc; atmel,can-isoc;
}; };
ep11: endpoint@11 { ep11: endpoint@b {
reg = <11>; reg = <11>;
atmel,fifo-size = <1024>; atmel,fifo-size = <1024>;
atmel,nb-banks = <2>; atmel,nb-banks = <2>;
atmel,can-isoc; atmel,can-isoc;
}; };
ep12: endpoint@12 { ep12: endpoint@c {
reg = <12>; reg = <12>;
atmel,fifo-size = <1024>; atmel,fifo-size = <1024>;
atmel,nb-banks = <2>; atmel,nb-banks = <2>;
atmel,can-isoc; atmel,can-isoc;
}; };
ep13: endpoint@13 { ep13: endpoint@d {
reg = <13>; reg = <13>;
atmel,fifo-size = <1024>; atmel,fifo-size = <1024>;
atmel,nb-banks = <2>; atmel,nb-banks = <2>;
atmel,can-isoc; atmel,can-isoc;
}; };
ep14: endpoint@14 { ep14: endpoint@e {
reg = <14>; reg = <14>;
atmel,fifo-size = <1024>; atmel,fifo-size = <1024>;
atmel,nb-banks = <2>; atmel,nb-banks = <2>;
atmel,can-isoc; atmel,can-isoc;
}; };
ep15: endpoint@15 { ep15: endpoint@f {
reg = <15>; reg = <15>;
atmel,fifo-size = <1024>; atmel,fifo-size = <1024>;
atmel,nb-banks = <2>; atmel,nb-banks = <2>;

1
configs/gardena-smart-gateway-at91sam_defconfig
View File

@@ -26,7 +26,6 @@ CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk mtdparts=atmel_nand:256k(boots
CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_SYS_CONSOLE_IS_IN_ENV=y
CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_SYS_CONSOLE_INFO_QUIET=y
CONFIG_SPL_SYS_MALLOC_SIMPLE=y CONFIG_SPL_SYS_MALLOC_SIMPLE=y
CONFIG_SPL_SEPARATE_BSS=y
# CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR is not set # CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR is not set
CONFIG_SPL_NAND_SUPPORT=y CONFIG_SPL_NAND_SUPPORT=y
CONFIG_HUSH_PARSER=y CONFIG_HUSH_PARSER=y

1
configs/sama5d27_som1_ek_mmc1_defconfig
View File

@@ -29,7 +29,6 @@ CONFIG_USE_BOOTARGS=y
CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk root=/dev/mmcblk1p2 rw rootwait" CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk root=/dev/mmcblk1p2 rw rootwait"
CONFIG_MISC_INIT_R=y CONFIG_MISC_INIT_R=y
# CONFIG_DISPLAY_BOARDINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_SPL_SEPARATE_BSS=y
CONFIG_HUSH_PARSER=y CONFIG_HUSH_PARSER=y
CONFIG_CMD_BOOTZ=y CONFIG_CMD_BOOTZ=y
# CONFIG_CMD_FLASH is not set # CONFIG_CMD_FLASH is not set

1
configs/sama5d27_som1_ek_mmc_defconfig
View File

@@ -30,7 +30,6 @@ CONFIG_USE_BOOTARGS=y
CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rw rootwait" CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rw rootwait"
CONFIG_MISC_INIT_R=y CONFIG_MISC_INIT_R=y
# CONFIG_DISPLAY_BOARDINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_SPL_SEPARATE_BSS=y
CONFIG_HUSH_PARSER=y CONFIG_HUSH_PARSER=y
CONFIG_CMD_BOOTZ=y CONFIG_CMD_BOOTZ=y
# CONFIG_CMD_FLASH is not set # CONFIG_CMD_FLASH is not set

1
configs/sama5d27_som1_ek_qspiflash_defconfig
View File

@@ -30,7 +30,6 @@ CONFIG_USE_BOOTARGS=y
CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rw rootwait" CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rw rootwait"
CONFIG_MISC_INIT_R=y CONFIG_MISC_INIT_R=y
# CONFIG_DISPLAY_BOARDINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_SPL_SEPARATE_BSS=y
CONFIG_HUSH_PARSER=y CONFIG_HUSH_PARSER=y
CONFIG_CMD_BOOTZ=y CONFIG_CMD_BOOTZ=y
# CONFIG_CMD_FLASH is not set # CONFIG_CMD_FLASH is not set

1
configs/sama5d27_wlsom1_ek_mmc_defconfig
View File

@@ -28,7 +28,6 @@ CONFIG_USE_BOOTARGS=y
CONFIG_MISC_INIT_R=y CONFIG_MISC_INIT_R=y
# CONFIG_DISPLAY_BOARDINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_DISPLAY_BOARDINFO_LATE=y
CONFIG_SPL_SEPARATE_BSS=y
CONFIG_SPL_DISPLAY_PRINT=y CONFIG_SPL_DISPLAY_PRINT=y
# CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR is not set # CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR is not set
CONFIG_SPL_AT91_MCK_BYPASS=y CONFIG_SPL_AT91_MCK_BYPASS=y

1
configs/sama5d27_wlsom1_ek_qspiflash_defconfig
View File

@@ -31,7 +31,6 @@ CONFIG_USE_BOOTARGS=y
CONFIG_MISC_INIT_R=y CONFIG_MISC_INIT_R=y
# CONFIG_DISPLAY_BOARDINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_DISPLAY_BOARDINFO_LATE=y
CONFIG_SPL_SEPARATE_BSS=y
CONFIG_SPL_DISPLAY_PRINT=y CONFIG_SPL_DISPLAY_PRINT=y
# CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR is not set # CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR is not set
CONFIG_SPL_DM_SPI_FLASH=y CONFIG_SPL_DM_SPI_FLASH=y

1
configs/sama5d2_icp_mmc_defconfig
View File

@@ -27,7 +27,6 @@ CONFIG_BOOTDELAY=3
CONFIG_USE_BOOTARGS=y CONFIG_USE_BOOTARGS=y
CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rw rootwait" CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rw rootwait"
# CONFIG_DISPLAY_BOARDINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_SPL_SEPARATE_BSS=y
CONFIG_SPL_DISPLAY_PRINT=y CONFIG_SPL_DISPLAY_PRINT=y
# CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR is not set # CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR is not set
CONFIG_SPL_RAM_SUPPORT=y CONFIG_SPL_RAM_SUPPORT=y

1
configs/sama5d2_xplained_emmc_defconfig
View File

@@ -28,7 +28,6 @@ CONFIG_BOOTDELAY=3
CONFIG_USE_BOOTARGS=y CONFIG_USE_BOOTARGS=y
CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rw rootwait" CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rw rootwait"
# CONFIG_DISPLAY_BOARDINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_SPL_SEPARATE_BSS=y
CONFIG_HUSH_PARSER=y CONFIG_HUSH_PARSER=y
CONFIG_CMD_BOOTZ=y CONFIG_CMD_BOOTZ=y
# CONFIG_CMD_FLASH is not set # CONFIG_CMD_FLASH is not set

1
configs/sama5d2_xplained_mmc_defconfig
View File

@@ -30,7 +30,6 @@ CONFIG_USE_BOOTARGS=y
CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk root=/dev/mmcblk1p2 rw rootwait" CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk root=/dev/mmcblk1p2 rw rootwait"
CONFIG_MISC_INIT_R=y CONFIG_MISC_INIT_R=y
# CONFIG_DISPLAY_BOARDINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_SPL_SEPARATE_BSS=y
CONFIG_HUSH_PARSER=y CONFIG_HUSH_PARSER=y
CONFIG_CMD_BOOTZ=y CONFIG_CMD_BOOTZ=y
# CONFIG_CMD_FLASH is not set # CONFIG_CMD_FLASH is not set

1
configs/sama5d2_xplained_qspiflash_defconfig
View File

@@ -30,7 +30,6 @@ CONFIG_USE_BOOTARGS=y
CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p1 rw rootwait" CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p1 rw rootwait"
CONFIG_MISC_INIT_R=y CONFIG_MISC_INIT_R=y
# CONFIG_DISPLAY_BOARDINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_SPL_SEPARATE_BSS=y
CONFIG_HUSH_PARSER=y CONFIG_HUSH_PARSER=y
CONFIG_CMD_BOOTZ=y CONFIG_CMD_BOOTZ=y
# CONFIG_CMD_FLASH is not set # CONFIG_CMD_FLASH is not set

1
configs/sama5d3_xplained_mmc_defconfig
View File

@@ -28,7 +28,6 @@ CONFIG_BOOTDELAY=3
CONFIG_USE_BOOTARGS=y CONFIG_USE_BOOTARGS=y
CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rw rootwait" CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rw rootwait"
# CONFIG_DISPLAY_BOARDINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_SPL_SEPARATE_BSS=y
CONFIG_HUSH_PARSER=y CONFIG_HUSH_PARSER=y
CONFIG_CMD_BOOTZ=y CONFIG_CMD_BOOTZ=y
# CONFIG_CMD_FLASH is not set # CONFIG_CMD_FLASH is not set

1
configs/sama5d3xek_mmc_defconfig
View File

@@ -30,7 +30,6 @@ CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rw rootwai
# CONFIG_CONSOLE_MUX is not set # CONFIG_CONSOLE_MUX is not set
CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_SYS_CONSOLE_IS_IN_ENV=y
# CONFIG_DISPLAY_BOARDINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_SPL_SEPARATE_BSS=y
CONFIG_HUSH_PARSER=y CONFIG_HUSH_PARSER=y
CONFIG_CMD_BOOTZ=y CONFIG_CMD_BOOTZ=y
# CONFIG_CMD_IMI is not set # CONFIG_CMD_IMI is not set

1
configs/sama5d4_xplained_mmc_defconfig
View File

@@ -29,7 +29,6 @@ CONFIG_USE_BOOTARGS=y
CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rw rootwait" CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rw rootwait"
CONFIG_MISC_INIT_R=y CONFIG_MISC_INIT_R=y
# CONFIG_DISPLAY_BOARDINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_SPL_SEPARATE_BSS=y
CONFIG_HUSH_PARSER=y CONFIG_HUSH_PARSER=y
CONFIG_CMD_BOOTZ=y CONFIG_CMD_BOOTZ=y
# CONFIG_CMD_FLASH is not set # CONFIG_CMD_FLASH is not set

1
configs/sama5d4ek_mmc_defconfig
View File

@@ -30,7 +30,6 @@ CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rw rootwai
# CONFIG_CONSOLE_MUX is not set # CONFIG_CONSOLE_MUX is not set
CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_SYS_CONSOLE_IS_IN_ENV=y
# CONFIG_DISPLAY_BOARDINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set
CONFIG_SPL_SEPARATE_BSS=y
CONFIG_HUSH_PARSER=y CONFIG_HUSH_PARSER=y
CONFIG_CMD_BOOTZ=y CONFIG_CMD_BOOTZ=y
# CONFIG_CMD_IMI is not set # CONFIG_CMD_IMI is not set