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

ARM: zynq: Remove all Xilinx private commands

Browse Source 
All platforms have been moved to distro boot that's why remove the rest of
configurations to have unified boot flow.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
This commit is contained in:
Michal Simek
2019-09-10 15:01:53 +02:00
parent a542a93735
commit 83a0e8054e
1 changed files with 3 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
include/configs/zynq-common.h
View File

@@ -152,12 +152,6 @@
# define BOOT_TARGET_DEVICES_NOR(func) # define BOOT_TARGET_DEVICES_NOR(func)
#endif #endif
#define BOOTENV_DEV_XILINX(devtypeu, devtypel, instance) \
"bootcmd_xilinx=run $modeboot\0"
#define BOOTENV_DEV_NAME_XILINX(devtypeu, devtypel, instance) \
"xilinx "
#define BOOTENV_DEV_QSPI(devtypeu, devtypel, instance) \ #define BOOTENV_DEV_QSPI(devtypeu, devtypel, instance) \
"bootcmd_qspi=sf probe 0 0 0 && " \ "bootcmd_qspi=sf probe 0 0 0 && " \
"sf read ${scriptaddr} ${script_offset_f} ${script_size_f} && " \ "sf read ${scriptaddr} ${script_offset_f} ${script_size_f} && " \
@@ -189,8 +183,7 @@
BOOT_TARGET_DEVICES_NOR(func) \ BOOT_TARGET_DEVICES_NOR(func) \
BOOT_TARGET_DEVICES_USB(func) \ BOOT_TARGET_DEVICES_USB(func) \
BOOT_TARGET_DEVICES_PXE(func) \ BOOT_TARGET_DEVICES_PXE(func) \
BOOT_TARGET_DEVICES_DHCP(func) \ BOOT_TARGET_DEVICES_DHCP(func)
func(XILINX, xilinx, na)
#include <config_distro_bootcmd.h> #include <config_distro_bootcmd.h>
#endif /* CONFIG_SPL_BUILD */ #endif /* CONFIG_SPL_BUILD */
@@ -198,57 +191,16 @@
/* Default environment */ /* Default environment */
#ifndef CONFIG_EXTRA_ENV_SETTINGS #ifndef CONFIG_EXTRA_ENV_SETTINGS
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \
"fit_image=fit.itb\0" \
"load_addr=0x2000000\0" \
"fit_size=0x800000\0" \
"flash_off=0x100000\0" \
"nor_flash_off=0xE2100000\0" \
"fdt_high=0x20000000\0" \ "fdt_high=0x20000000\0" \
"initrd_high=0x20000000\0" \ "initrd_high=0x20000000\0" \
"scriptaddr=0x20000\0" \ "scriptaddr=0x20000\0" \
"script_offset_f=0xFC0000\0" \ "script_offset_f=0xFC0000\0" \
"script_size_f=0x40000\0" \ "script_size_f=0x40000\0" \
"loadbootenv_addr=0x2000000\0" \
"fdt_addr_r=0x1f00000\0" \ "fdt_addr_r=0x1f00000\0" \
"pxefile_addr_r=0x2000000\0" \ "pxefile_addr_r=0x2000000\0" \
"kernel_addr_r=0x2000000\0" \ "kernel_addr_r=0x2000000\0" \
"scriptaddr=0x3000000\0" \ "scriptaddr=0x3000000\0" \
"ramdisk_addr_r=0x3100000\0" \ "ramdisk_addr_r=0x3100000\0" \
"bootenv=uEnv.txt\0" \
"bootenv_dev=mmc\0" \
"loadbootenv=load ${bootenv_dev} 0 ${loadbootenv_addr} ${bootenv}\0" \
"importbootenv=echo Importing environment from ${bootenv_dev} ...; " \
"env import -t ${loadbootenv_addr} $filesize\0" \
"bootenv_existence_test=test -e ${bootenv_dev} 0 /${bootenv}\0" \
"setbootenv=if env run bootenv_existence_test; then " \
"if env run loadbootenv; then " \
"env run importbootenv; " \
"fi; " \
"fi; \0" \
"sd_loadbootenv=setenv bootenv_dev mmc && " \
"run setbootenv \0" \
"usb_loadbootenv=setenv bootenv_dev usb && usb start && run setbootenv \0" \
"preboot=if test $modeboot = sdboot; then " \
"run sd_loadbootenv; " \
"echo Checking if uenvcmd is set ...; " \
"if test -n $uenvcmd; then " \
"echo Running uenvcmd ...; " \
"run uenvcmd; " \
"fi; " \
"fi; \0" \
"norboot=echo Copying FIT from NOR flash to RAM... && " \
"cp.b ${nor_flash_off} ${load_addr} ${fit_size} && " \
"bootm ${load_addr}\0" \
"sdboot=echo Copying FIT from SD to RAM... && " \
"load mmc 0 ${load_addr} ${fit_image} && " \
"bootm ${load_addr}\0" \
"jtagboot=echo TFTPing FIT to RAM... && " \
"tftpboot ${load_addr} ${fit_image} && " \
"bootm ${load_addr}\0" \
"usbboot=if usb start; then " \
"echo Copying FIT from USB to RAM... && " \
"load usb 0 ${load_addr} ${fit_image} && " \
"bootm ${load_addr}; fi\0" \
DFU_ALT_INFO \ DFU_ALT_INFO \
BOOTENV BOOTENV
#endif #endif