colin/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xilinx: Introduce XILINX_MINI configuration

Browse Source 
There is no common symbol which mini configurations are using and recent
get_mem_top() changes adding 1.3kB without having a way to remove it.
That's why introduce new symbol which can be used for removing features
which are not requested by these configurations.

Signed-off-by: Michal Simek <michal.simek@amd.com>
Link: https://lore.kernel.org/r/aa27b72e17057fa8cbdd92a2bbb863a31c8c1226.1731681053.git.michal.simek@amd.com
This commit is contained in:
Michal Simek
2024-11-15 15:31:02 +01:00
parent 57066053b6
commit 383fc2f501
21 changed files with 32 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
board/xilinx/Kconfig
View File

@@ -40,6 +40,15 @@ config XILINX_PS_INIT_FILE
endif endif
config XILINX_MINI
bool "Mini configuration"
depends on ARCH_ZYNQMP || ARCH_VERSAL || ARCH_VERSAL_NET || ARCH_VERSAL2
help
This option disables features which are not needed for Mini U-Boot
configurations. Mini U-Boot is running in EL3 mostly on size contrained
systems. It's purpose is to program non volatile memories or running
initial memory tests.
config XILINX_OF_BOARD_DTB_ADDR config XILINX_OF_BOARD_DTB_ADDR
hex "Default DTB pickup address" hex "Default DTB pickup address"
default 0x1000 if ARCH_VERSAL || ARCH_VERSAL_NET || ARCH_VERSAL2 default 0x1000 if ARCH_VERSAL || ARCH_VERSAL_NET || ARCH_VERSAL2

4
board/xilinx/common/board.c
View File

@@ -678,6 +678,8 @@ int ft_board_setup(void *blob, struct bd_info *bd)
} }
#endif #endif
#ifndef CONFIG_XILINX_MINI
#ifndef MMU_SECTION_SIZE #ifndef MMU_SECTION_SIZE
#define MMU_SECTION_SIZE (1 * 1024 * 1024) #define MMU_SECTION_SIZE (1 * 1024 * 1024)
#endif #endif
@@ -701,3 +703,5 @@ phys_addr_t board_get_usable_ram_top(phys_size_t total_size)
return reg + size; return reg + size;
} }
#endif

1
configs/amd_versal2_mini_defconfig
View File

@@ -15,6 +15,7 @@ CONFIG_DEFAULT_DEVICE_TREE="amd-versal2-mini"
CONFIG_SYS_LOAD_ADDR=0xBBF80000 CONFIG_SYS_LOAD_ADDR=0xBBF80000
CONFIG_DEBUG_UART_BASE=0xf1920000 CONFIG_DEBUG_UART_BASE=0xf1920000
CONFIG_DEBUG_UART_CLOCK=100000000 CONFIG_DEBUG_UART_CLOCK=100000000
CONFIG_XILINX_MINI=y
CONFIG_SYS_MEM_RSVD_FOR_MMU=y CONFIG_SYS_MEM_RSVD_FOR_MMU=y
# CONFIG_PSCI_RESET is not set # CONFIG_PSCI_RESET is not set
CONFIG_DEBUG_UART=y CONFIG_DEBUG_UART=y

1
configs/amd_versal2_mini_emmc_defconfig
View File

@@ -12,6 +12,7 @@ CONFIG_DEFAULT_DEVICE_TREE="amd-versal2-mini"
CONFIG_SYS_LOAD_ADDR=0x8000000 CONFIG_SYS_LOAD_ADDR=0x8000000
CONFIG_DEBUG_UART_BASE=0xf1920000 CONFIG_DEBUG_UART_BASE=0xf1920000
CONFIG_DEBUG_UART_CLOCK=100000000 CONFIG_DEBUG_UART_CLOCK=100000000
CONFIG_XILINX_MINI=y
# CONFIG_PSCI_RESET is not set # CONFIG_PSCI_RESET is not set
CONFIG_DEBUG_UART=y CONFIG_DEBUG_UART=y
# CONFIG_EXPERT is not set # CONFIG_EXPERT is not set

1
configs/amd_versal2_mini_ospi_defconfig
View File

@@ -15,6 +15,7 @@ CONFIG_DEFAULT_DEVICE_TREE="amd-versal2-mini"
CONFIG_SYS_LOAD_ADDR=0xBBF80000 CONFIG_SYS_LOAD_ADDR=0xBBF80000
CONFIG_DEBUG_UART_BASE=0xf1920000 CONFIG_DEBUG_UART_BASE=0xf1920000
CONFIG_DEBUG_UART_CLOCK=100000000 CONFIG_DEBUG_UART_CLOCK=100000000
CONFIG_XILINX_MINI=y
CONFIG_SYS_MEM_RSVD_FOR_MMU=y CONFIG_SYS_MEM_RSVD_FOR_MMU=y
# CONFIG_PSCI_RESET is not set # CONFIG_PSCI_RESET is not set
CONFIG_DEBUG_UART=y CONFIG_DEBUG_UART=y

1
configs/amd_versal2_mini_qspi_defconfig
View File

@@ -15,6 +15,7 @@ CONFIG_DEFAULT_DEVICE_TREE="amd-versal2-mini"
CONFIG_SYS_LOAD_ADDR=0xBBF80000 CONFIG_SYS_LOAD_ADDR=0xBBF80000
CONFIG_DEBUG_UART_BASE=0xf1920000 CONFIG_DEBUG_UART_BASE=0xf1920000
CONFIG_DEBUG_UART_CLOCK=100000000 CONFIG_DEBUG_UART_CLOCK=100000000
CONFIG_XILINX_MINI=y
CONFIG_SYS_MEM_RSVD_FOR_MMU=y CONFIG_SYS_MEM_RSVD_FOR_MMU=y
# CONFIG_PSCI_RESET is not set # CONFIG_PSCI_RESET is not set
CONFIG_DEBUG_UART=y CONFIG_DEBUG_UART=y

1
configs/xilinx_versal_mini_defconfig
View File

@@ -12,6 +12,7 @@ CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0xfffe0000
CONFIG_ENV_SIZE=0x80 CONFIG_ENV_SIZE=0x80
CONFIG_DEFAULT_DEVICE_TREE="versal-mini" CONFIG_DEFAULT_DEVICE_TREE="versal-mini"
CONFIG_SYS_LOAD_ADDR=0x8000000 CONFIG_SYS_LOAD_ADDR=0x8000000
CONFIG_XILINX_MINI=y
CONFIG_SYS_MEM_RSVD_FOR_MMU=y CONFIG_SYS_MEM_RSVD_FOR_MMU=y
# CONFIG_PSCI_RESET is not set # CONFIG_PSCI_RESET is not set
CONFIG_SYS_MEMTEST_START=0x00000000 CONFIG_SYS_MEMTEST_START=0x00000000

1
configs/xilinx_versal_mini_emmc0_defconfig
View File

@@ -12,6 +12,7 @@ CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x10000
CONFIG_ENV_SIZE=0x80 CONFIG_ENV_SIZE=0x80
CONFIG_DEFAULT_DEVICE_TREE="versal-mini-emmc0" CONFIG_DEFAULT_DEVICE_TREE="versal-mini-emmc0"
CONFIG_SYS_LOAD_ADDR=0x8000000 CONFIG_SYS_LOAD_ADDR=0x8000000
CONFIG_XILINX_MINI=y
# CONFIG_PSCI_RESET is not set # CONFIG_PSCI_RESET is not set
# CONFIG_EXPERT is not set # CONFIG_EXPERT is not set
CONFIG_REMAKE_ELF=y CONFIG_REMAKE_ELF=y

1
configs/xilinx_versal_mini_emmc1_defconfig
View File

@@ -12,6 +12,7 @@ CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x10000
CONFIG_ENV_SIZE=0x80 CONFIG_ENV_SIZE=0x80
CONFIG_DEFAULT_DEVICE_TREE="versal-mini-emmc1" CONFIG_DEFAULT_DEVICE_TREE="versal-mini-emmc1"
CONFIG_SYS_LOAD_ADDR=0x8000000 CONFIG_SYS_LOAD_ADDR=0x8000000
CONFIG_XILINX_MINI=y
# CONFIG_PSCI_RESET is not set # CONFIG_PSCI_RESET is not set
# CONFIG_EXPERT is not set # CONFIG_EXPERT is not set
CONFIG_REMAKE_ELF=y CONFIG_REMAKE_ELF=y

1
configs/xilinx_versal_mini_ospi_defconfig
View File

@@ -13,6 +13,7 @@ CONFIG_ENV_SIZE=0x80
# CONFIG_DM_GPIO is not set # CONFIG_DM_GPIO is not set
CONFIG_DEFAULT_DEVICE_TREE="versal-mini-ospi-single" CONFIG_DEFAULT_DEVICE_TREE="versal-mini-ospi-single"
CONFIG_SYS_LOAD_ADDR=0x8000000 CONFIG_SYS_LOAD_ADDR=0x8000000
CONFIG_XILINX_MINI=y
CONFIG_SYS_MEM_RSVD_FOR_MMU=y CONFIG_SYS_MEM_RSVD_FOR_MMU=y
CONFIG_VERSAL_NO_DDR=y CONFIG_VERSAL_NO_DDR=y
# CONFIG_PSCI_RESET is not set # CONFIG_PSCI_RESET is not set

1
configs/xilinx_versal_mini_qspi_defconfig
View File

@@ -11,6 +11,7 @@ CONFIG_SF_DEFAULT_SPEED=30000000
CONFIG_ENV_SIZE=0x80 CONFIG_ENV_SIZE=0x80
CONFIG_DEFAULT_DEVICE_TREE="versal-mini-qspi-single" CONFIG_DEFAULT_DEVICE_TREE="versal-mini-qspi-single"
CONFIG_SYS_LOAD_ADDR=0x8000000 CONFIG_SYS_LOAD_ADDR=0x8000000
CONFIG_XILINX_MINI=y
CONFIG_SYS_MEM_RSVD_FOR_MMU=y CONFIG_SYS_MEM_RSVD_FOR_MMU=y
CONFIG_VERSAL_NO_DDR=y CONFIG_VERSAL_NO_DDR=y
# CONFIG_PSCI_RESET is not set # CONFIG_PSCI_RESET is not set

1
configs/xilinx_versal_net_mini_defconfig
View File

@@ -14,6 +14,7 @@ CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0xBBF10000
CONFIG_ENV_SIZE=0x80 CONFIG_ENV_SIZE=0x80
CONFIG_DEFAULT_DEVICE_TREE="versal-net-mini" CONFIG_DEFAULT_DEVICE_TREE="versal-net-mini"
CONFIG_SYS_LOAD_ADDR=0xBBF00000 CONFIG_SYS_LOAD_ADDR=0xBBF00000
CONFIG_XILINX_MINI=y
CONFIG_SYS_MEM_RSVD_FOR_MMU=y CONFIG_SYS_MEM_RSVD_FOR_MMU=y
# CONFIG_PSCI_RESET is not set # CONFIG_PSCI_RESET is not set
CONFIG_SYS_MEMTEST_START=0x00000000 CONFIG_SYS_MEMTEST_START=0x00000000

1
configs/xilinx_versal_net_mini_emmc_defconfig
View File

@@ -10,6 +10,7 @@ CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x10000
CONFIG_ENV_SIZE=0x80 CONFIG_ENV_SIZE=0x80
CONFIG_DEFAULT_DEVICE_TREE="versal-net-mini-emmc" CONFIG_DEFAULT_DEVICE_TREE="versal-net-mini-emmc"
CONFIG_SYS_LOAD_ADDR=0x8000000 CONFIG_SYS_LOAD_ADDR=0x8000000
CONFIG_XILINX_MINI=y
# CONFIG_PSCI_RESET is not set # CONFIG_PSCI_RESET is not set
# CONFIG_EXPERT is not set # CONFIG_EXPERT is not set
CONFIG_REMAKE_ELF=y CONFIG_REMAKE_ELF=y

1
configs/xilinx_versal_net_mini_ospi_defconfig
View File

@@ -13,6 +13,7 @@ CONFIG_ENV_SIZE=0x80
# CONFIG_DM_GPIO is not set # CONFIG_DM_GPIO is not set
CONFIG_DEFAULT_DEVICE_TREE="versal-net-mini-ospi-single" CONFIG_DEFAULT_DEVICE_TREE="versal-net-mini-ospi-single"
CONFIG_SYS_LOAD_ADDR=0xBBF80000 CONFIG_SYS_LOAD_ADDR=0xBBF80000
CONFIG_XILINX_MINI=y
CONFIG_SYS_MEM_RSVD_FOR_MMU=y CONFIG_SYS_MEM_RSVD_FOR_MMU=y
# CONFIG_PSCI_RESET is not set # CONFIG_PSCI_RESET is not set
CONFIG_LTO=y CONFIG_LTO=y

1
configs/xilinx_versal_net_mini_qspi_defconfig
View File

@@ -11,6 +11,7 @@ CONFIG_SF_DEFAULT_SPEED=30000000
CONFIG_ENV_SIZE=0x80 CONFIG_ENV_SIZE=0x80
CONFIG_DEFAULT_DEVICE_TREE="versal-net-mini-qspi-single" CONFIG_DEFAULT_DEVICE_TREE="versal-net-mini-qspi-single"
CONFIG_SYS_LOAD_ADDR=0xBBF80000 CONFIG_SYS_LOAD_ADDR=0xBBF80000
CONFIG_XILINX_MINI=y
CONFIG_SYS_MEM_RSVD_FOR_MMU=y CONFIG_SYS_MEM_RSVD_FOR_MMU=y
# CONFIG_PSCI_RESET is not set # CONFIG_PSCI_RESET is not set
CONFIG_LTO=y CONFIG_LTO=y

1
configs/xilinx_zynqmp_mini_defconfig
View File

@@ -9,6 +9,7 @@ CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0xfffe0000
CONFIG_ENV_SIZE=0x80 CONFIG_ENV_SIZE=0x80
CONFIG_DEFAULT_DEVICE_TREE="zynqmp-mini" CONFIG_DEFAULT_DEVICE_TREE="zynqmp-mini"
CONFIG_SYS_LOAD_ADDR=0x8000000 CONFIG_SYS_LOAD_ADDR=0x8000000
CONFIG_XILINX_MINI=y
CONFIG_SYS_MEM_RSVD_FOR_MMU=y CONFIG_SYS_MEM_RSVD_FOR_MMU=y
CONFIG_SYS_MEMTEST_START=0x00000000 CONFIG_SYS_MEMTEST_START=0x00000000
CONFIG_SYS_MEMTEST_END=0x00001000 CONFIG_SYS_MEMTEST_END=0x00001000

1
configs/xilinx_zynqmp_mini_emmc0_defconfig
View File

@@ -15,6 +15,7 @@ CONFIG_SPL_SYS_MALLOC_F_LEN=0x600
CONFIG_SPL_BSS_MAX_SIZE=0x80000 CONFIG_SPL_BSS_MAX_SIZE=0x80000
CONFIG_SYS_LOAD_ADDR=0x8000000 CONFIG_SYS_LOAD_ADDR=0x8000000
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_XILINX_MINI=y
CONFIG_REMAKE_ELF=y CONFIG_REMAKE_ELF=y
# CONFIG_MP is not set # CONFIG_MP is not set
# CONFIG_EFI_LOADER is not set # CONFIG_EFI_LOADER is not set

1
configs/xilinx_zynqmp_mini_emmc1_defconfig
View File

@@ -15,6 +15,7 @@ CONFIG_SPL_SYS_MALLOC_F_LEN=0x600
CONFIG_SPL_BSS_MAX_SIZE=0x80000 CONFIG_SPL_BSS_MAX_SIZE=0x80000
CONFIG_SYS_LOAD_ADDR=0x8000000 CONFIG_SYS_LOAD_ADDR=0x8000000
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_XILINX_MINI=y
CONFIG_REMAKE_ELF=y CONFIG_REMAKE_ELF=y
# CONFIG_MP is not set # CONFIG_MP is not set
# CONFIG_EFI_LOADER is not set # CONFIG_EFI_LOADER is not set

1
configs/xilinx_zynqmp_mini_nand_defconfig
View File

@@ -10,6 +10,7 @@ CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x40000
CONFIG_ENV_SIZE=0x80 CONFIG_ENV_SIZE=0x80
CONFIG_DEFAULT_DEVICE_TREE="zynqmp-mini-nand" CONFIG_DEFAULT_DEVICE_TREE="zynqmp-mini-nand"
CONFIG_SYS_LOAD_ADDR=0x8000000 CONFIG_SYS_LOAD_ADDR=0x8000000
CONFIG_XILINX_MINI=y
CONFIG_REMAKE_ELF=y CONFIG_REMAKE_ELF=y
# CONFIG_MP is not set # CONFIG_MP is not set
# CONFIG_EFI_LOADER is not set # CONFIG_EFI_LOADER is not set

1
configs/xilinx_zynqmp_mini_nand_single_defconfig
View File

@@ -10,6 +10,7 @@ CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x40000
CONFIG_ENV_SIZE=0x80 CONFIG_ENV_SIZE=0x80
CONFIG_DEFAULT_DEVICE_TREE="zynqmp-mini-nand" CONFIG_DEFAULT_DEVICE_TREE="zynqmp-mini-nand"
CONFIG_SYS_LOAD_ADDR=0x8000000 CONFIG_SYS_LOAD_ADDR=0x8000000
CONFIG_XILINX_MINI=y
CONFIG_REMAKE_ELF=y CONFIG_REMAKE_ELF=y
# CONFIG_MP is not set # CONFIG_MP is not set
# CONFIG_EFI_LOADER is not set # CONFIG_EFI_LOADER is not set

1
configs/xilinx_zynqmp_mini_qspi_defconfig
View File

@@ -15,6 +15,7 @@ CONFIG_SYS_LOAD_ADDR=0x8000000
CONFIG_SPL=y CONFIG_SPL=y
# CONFIG_SPL_FS_FAT is not set # CONFIG_SPL_FS_FAT is not set
# CONFIG_SPL_LIBDISK_SUPPORT is not set # CONFIG_SPL_LIBDISK_SUPPORT is not set
CONFIG_XILINX_MINI=y
CONFIG_SYS_MEM_RSVD_FOR_MMU=y CONFIG_SYS_MEM_RSVD_FOR_MMU=y
CONFIG_ZYNQMP_NO_DDR=y CONFIG_ZYNQMP_NO_DDR=y
# CONFIG_PSCI_RESET is not set # CONFIG_PSCI_RESET is not set