From mboxrd@z Thu Jan 1 00:00:00 1970 From: Hans de Goede Date: Fri, 1 Aug 2014 09:46:45 +0200 Subject: [U-Boot] [PATCH 5/7] sunxi-common.h: Use new generic $bootcmd In-Reply-To: <1406879207-12322-1-git-send-email-hdegoede@redhat.com> References: <1406879207-12322-1-git-send-email-hdegoede@redhat.com> Message-ID: <1406879207-12322-5-git-send-email-hdegoede@redhat.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Use the new standard bootcmd from . Signed-off-by: Hans de Goede --- include/configs/sunxi-common.h | 27 ++++++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h index 4c712f3..f5a702a 100644 --- a/include/configs/sunxi-common.h +++ b/include/configs/sunxi-common.h @@ -123,9 +123,6 @@ #define CONFIG_ENV_OFFSET (544 << 10) /* (8 + 24 + 512) KiB */ #define CONFIG_ENV_SIZE (128 << 10) /* 128 KiB */ -#define CONFIG_EXTRA_ENV_SETTINGS \ - "bootm_size=0x10000000\0" - #include #undef CONFIG_CMD_FPGA @@ -219,6 +216,30 @@ #ifndef CONFIG_SPL_BUILD #include + +#ifdef CONFIG_AHCI +#define BOOT_TARGET_DEVICES(func) \ + func(MMC, mmc, 0) \ + func(SCSI, scsi, 0) \ + func(USB, usb, 0) \ + func(PXE, pxe, na) \ + func(DHCP, dhcp, na) +#else +#define BOOT_TARGET_DEVICES(func) \ + func(MMC, mmc, 0) \ + func(USB, usb, 0) \ + func(PXE, pxe, na) \ + func(DHCP, dhcp, na) +#endif + +#include + +#define CONFIG_EXTRA_ENV_SETTINGS \ + "bootm_size=0x10000000\0" \ + BOOTENV + +#else /* ifndef CONFIG_SPL_BUILD */ +#define CONFIG_EXTRA_ENV_SETTINGS #endif #endif /* _SUNXI_COMMON_CONFIG_H */ -- 2.0.3