mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-11 07:34:31 +00:00
include: armv7: Enable distroboot across all configs
Since K3 devices are moving towards distroboot, remove duplicates and add it in common file to import from. Signed-off-by: Manorit Chawdhry <m-chawdhry@ti.com> [trini: Add am65x_evm to this patch] Signed-off-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
Manorit Chawdhry
Tom Rini
parent
4ae1a2470c
commit
53873974a4
7 changed files with 50 additions and 171 deletions
|
|
@ -15,77 +15,6 @@
|
|||
/* DDR Configuration */
|
||||
#define CFG_SYS_SDRAM_BASE1 0x880000000
|
||||
|
||||
#define PARTS_DEFAULT \
|
||||
/* Linux partitions */ \
|
||||
"name=rootfs,start=0,size=-,uuid=${uuid_gpt_rootfs}\0" \
|
||||
|
||||
/* U-Boot general configuration */
|
||||
#define EXTRA_ENV_AM62A7_BOARD_SETTINGS \
|
||||
"default_device_tree=ti/k3-am62a7-sk.dtb\0" \
|
||||
"findfdt=" \
|
||||
"setenv name_fdt ${default_device_tree};" \
|
||||
"setenv fdtfile ${name_fdt}\0" \
|
||||
"name_kern=Image\0" \
|
||||
"console=ttyS2,115200n8\0" \
|
||||
"args_all=setenv optargs earlycon=ns16550a,mmio32,0x02800000 " \
|
||||
"${mtdparts}\0" \
|
||||
"run_kern=booti ${loadaddr} ${rd_spec} ${fdtaddr}\0"
|
||||
|
||||
/* U-Boot MMC-specific configuration */
|
||||
#define EXTRA_ENV_AM62A7_BOARD_SETTINGS_MMC \
|
||||
"boot=mmc\0" \
|
||||
"mmcdev=1\0" \
|
||||
"bootpart=1:2\0" \
|
||||
"bootdir=/boot\0" \
|
||||
"rd_spec=-\0" \
|
||||
"init_mmc=run args_all args_mmc\0" \
|
||||
"get_fdt_mmc=load mmc ${bootpart} ${fdtaddr} ${bootdir}/${name_fdt}\0" \
|
||||
"get_overlay_mmc=" \
|
||||
"fdt address ${fdtaddr};" \
|
||||
"fdt resize 0x100000;" \
|
||||
"for overlay in $name_overlays;" \
|
||||
"do;" \
|
||||
"load mmc ${bootpart} ${dtboaddr} ${bootdir}/${overlay} && " \
|
||||
"fdt apply ${dtboaddr};" \
|
||||
"done;\0" \
|
||||
"get_kern_mmc=load mmc ${bootpart} ${loadaddr} " \
|
||||
"${bootdir}/${name_kern}\0" \
|
||||
"get_fit_mmc=load mmc ${bootpart} ${addr_fit} " \
|
||||
"${bootdir}/${name_fit}\0" \
|
||||
"partitions=" PARTS_DEFAULT
|
||||
|
||||
#define BOOTENV_DEV_TI_MMC(devtypeu, devtypel, instance) \
|
||||
DEFAULT_MMC_TI_ARGS \
|
||||
EXTRA_ENV_AM62A7_BOARD_SETTINGS_MMC \
|
||||
"bootcmd_ti_mmc=" \
|
||||
"run findfdt; run envboot; run init_mmc;" \
|
||||
"if test ${boot_fit} -eq 1; then;" \
|
||||
"run get_fit_mmc; run get_overlaystring;" \
|
||||
"run run_fit;" \
|
||||
"else;" \
|
||||
"run get_kern_mmc; run get_fdt_mmc;" \
|
||||
"run get_overlay_mmc;" \
|
||||
"run run_kern;" \
|
||||
"fi;\0"
|
||||
|
||||
#define BOOTENV_DEV_NAME_TI_MMC(devtyeu, devtypel, instance) \
|
||||
"ti_mmc "
|
||||
|
||||
#if IS_ENABLED(CONFIG_CMD_MMC)
|
||||
#define BOOT_TARGET_MMC(func) \
|
||||
func(TI_MMC, ti_mmc, na)
|
||||
#else
|
||||
#define BOOT_TARGET_MMC(func)
|
||||
#endif /* IS_ENABLED(CONFIG_CMD_MMC) */
|
||||
|
||||
#define BOOT_TARGET_DEVICES(func) \
|
||||
BOOT_TARGET_MMC(func)
|
||||
|
||||
#include <config_distro_bootcmd.h>
|
||||
|
||||
/* Incorporate settings into the U-Boot environment */
|
||||
#define CFG_EXTRA_ENV_SETTINGS \
|
||||
BOOTENV
|
||||
|
||||
/* Now for the remaining common defines */
|
||||
#include <configs/ti_armv7_common.h>
|
||||
|
|
|
|||
|
|
@ -15,33 +15,6 @@
|
|||
/* DDR Configuration */
|
||||
#define CFG_SYS_SDRAM_BASE1 0x880000000
|
||||
|
||||
#ifdef CONFIG_CMD_MMC
|
||||
#define DISTRO_BOOT_DEV_MMC(func) func(MMC, mmc, 0) func(MMC, mmc, 1)
|
||||
#else
|
||||
#define DISTRO_BOOT_DEV_MMC(func)
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_CMD_PXE
|
||||
#define DISTRO_BOOT_DEV_PXE(func) func(PXE, pxe, na)
|
||||
#else
|
||||
#define DISTRO_BOOT_DEV_PXE(func)
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_CMD_DHCP
|
||||
#define DISTRO_BOOT_DEV_DHCP(func) func(DHCP, dhcp, na)
|
||||
#else
|
||||
#define DISTRO_BOOT_DEV_DHCP(func)
|
||||
#endif
|
||||
|
||||
#define BOOT_TARGET_DEVICES(func) \
|
||||
DISTRO_BOOT_DEV_MMC(func) \
|
||||
DISTRO_BOOT_DEV_PXE(func) \
|
||||
DISTRO_BOOT_DEV_DHCP(func)
|
||||
|
||||
/* Incorporate settings into the U-Boot environment */
|
||||
#define CFG_EXTRA_ENV_SETTINGS \
|
||||
BOOTENV
|
||||
|
||||
/* Now for the remaining common defines */
|
||||
#include <configs/ti_armv7_common.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -17,20 +17,6 @@
|
|||
/* DDR Configuration */
|
||||
#define CFG_SYS_SDRAM_BASE1 0x880000000
|
||||
|
||||
#ifdef CONFIG_TARGET_AM654_A53_EVM
|
||||
#define BOOT_TARGET_DEVICES(func) \
|
||||
func(MMC, mmc, 1) \
|
||||
func(MMC, mmc, 0)
|
||||
|
||||
#include <config_distro_bootcmd.h>
|
||||
#else
|
||||
#define BOOTENV
|
||||
#endif
|
||||
|
||||
/* Incorporate settings into the U-Boot environment */
|
||||
#define CFG_EXTRA_ENV_SETTINGS \
|
||||
BOOTENV
|
||||
|
||||
/* Now for the remaining common defines */
|
||||
#include <configs/ti_armv7_common.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -13,31 +13,6 @@
|
|||
|
||||
#include <linux/sizes.h>
|
||||
|
||||
#if IS_ENABLED(CONFIG_CMD_USB)
|
||||
# define BOOT_TARGET_USB(func) \
|
||||
func(USB, usb, 0) \
|
||||
func(USB, usb, 1) \
|
||||
func(USB, usb, 2)
|
||||
#else
|
||||
# define BOOT_TARGET_USB(func)
|
||||
#endif
|
||||
|
||||
/*
|
||||
* This defines all MMC devices, even if the basic variant has no mmc1.
|
||||
* The non-supported device will be removed from the boot targets during
|
||||
* runtime, when that board was detected.
|
||||
*/
|
||||
#define BOOT_TARGET_DEVICES(func) \
|
||||
func(MMC, mmc, 1) \
|
||||
func(MMC, mmc, 0) \
|
||||
BOOT_TARGET_USB(func)
|
||||
|
||||
#include <config_distro_bootcmd.h>
|
||||
|
||||
#define CFG_EXTRA_ENV_SETTINGS \
|
||||
DEFAULT_LINUX_BOOT_ENV \
|
||||
BOOTENV
|
||||
|
||||
#include <configs/ti_armv7_common.h>
|
||||
|
||||
#ifdef CONFIG_ENV_WRITEABLE_LIST
|
||||
|
|
|
|||
|
|
@ -24,37 +24,6 @@
|
|||
#define CFG_SYS_UBOOT_BASE 0x50080000
|
||||
#endif
|
||||
|
||||
#if CONFIG_IS_ENABLED(CMD_PXE)
|
||||
# define BOOT_TARGET_PXE(func) func(PXE, pxe, na)
|
||||
#else
|
||||
# define BOOT_TARGET_PXE(func)
|
||||
#endif
|
||||
|
||||
#if CONFIG_IS_ENABLED(CMD_DHCP)
|
||||
# define BOOT_TARGET_DHCP(func) func(DHCP, dhcp, na)
|
||||
#else
|
||||
# define BOOT_TARGET_DHCP(func)
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_CMD_USB
|
||||
# define BOOT_TARGET_USB(func) func(USB, usb, 0)
|
||||
#else
|
||||
# define BOOT_TARGET_USB(func)
|
||||
#endif
|
||||
|
||||
#define BOOT_TARGET_DEVICES(func) \
|
||||
BOOT_TARGET_USB(func) \
|
||||
func(MMC, mmc, 1) \
|
||||
func(MMC, mmc, 0) \
|
||||
BOOT_TARGET_PXE(func) \
|
||||
BOOT_TARGET_DHCP(func)
|
||||
|
||||
#include <config_distro_bootcmd.h>
|
||||
|
||||
/* Incorporate settings into the U-Boot environment */
|
||||
#define CFG_EXTRA_ENV_SETTINGS \
|
||||
BOOTENV
|
||||
|
||||
/* Now for the remaining common defines */
|
||||
#include <configs/ti_armv7_common.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -23,9 +23,6 @@
|
|||
#define CFG_SYS_UBOOT_BASE 0x50080000
|
||||
#endif
|
||||
|
||||
/* Incorporate settings into the U-Boot environment */
|
||||
#define CFG_EXTRA_ENV_SETTINGS
|
||||
|
||||
/* Now for the remaining common defines */
|
||||
#include <configs/ti_armv7_common.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -154,4 +154,54 @@
|
|||
#define NETARGS ""
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_ARM64
|
||||
#ifdef CONFIG_DISTRO_DEFAULTS
|
||||
#ifdef CONFIG_CMD_PXE
|
||||
# define BOOT_TARGET_PXE(func) func(PXE, pxe, na)
|
||||
#else
|
||||
# define BOOT_TARGET_PXE(func)
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_CMD_DHCP
|
||||
# define BOOT_TARGET_DHCP(func) func(DHCP, dhcp, na)
|
||||
#else
|
||||
# define BOOT_TARGET_DHCP(func)
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_CMD_MMC
|
||||
#define BOOT_TARGET_MMC(func) \
|
||||
func(TI_MMC, ti_mmc, na) \
|
||||
func(MMC, mmc, 0) \
|
||||
func(MMC, mmc, 1)
|
||||
#else
|
||||
#define BOOT_TARGET_MMC(func)
|
||||
#endif
|
||||
|
||||
#define BOOTENV_DEV_TI_MMC(devtypeu, devtypel, instance)
|
||||
|
||||
#define BOOTENV_DEV_NAME_TI_MMC(devtyeu, devtypel, instance) \
|
||||
"ti_mmc "
|
||||
|
||||
#ifdef CONFIG_CMD_USB
|
||||
# define BOOT_TARGET_USB(func) func(USB, usb, 0)
|
||||
#else
|
||||
# define BOOT_TARGET_USB(func)
|
||||
#endif
|
||||
|
||||
#define BOOT_TARGET_DEVICES(func) \
|
||||
BOOT_TARGET_MMC(func) \
|
||||
BOOT_TARGET_USB(func) \
|
||||
BOOT_TARGET_PXE(func) \
|
||||
BOOT_TARGET_DHCP(func)
|
||||
|
||||
#include <config_distro_bootcmd.h>
|
||||
|
||||
/* Incorporate settings into the U-Boot environment */
|
||||
#define CFG_EXTRA_ENV_SETTINGS \
|
||||
BOOTENV
|
||||
|
||||
#endif
|
||||
|
||||
#endif /* CONFIG_ARM64 */
|
||||
|
||||
#endif /* __CONFIG_TI_ARMV7_COMMON_H__ */
|
||||
|
|
|
|||
Loading…
Reference in a new issue