summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans de Goede <hdegoede@redhat.com>2014-07-31 23:04:45 +0200
committerHans de Goede <hdegoede@redhat.com>2014-08-12 08:42:32 +0200
commit2ec3a612f440364fa0ed250f22e7d3c3a8d72b92 (patch)
tree28586ec900d6727cd1f273a944fabb76b05790fe
parent8cc96848f0a467922820895b6b2363b0c64163b5 (diff)
downloadu-boot-imx-2ec3a612f440364fa0ed250f22e7d3c3a8d72b92.zip
u-boot-imx-2ec3a612f440364fa0ed250f22e7d3c3a8d72b92.tar.gz
u-boot-imx-2ec3a612f440364fa0ed250f22e7d3c3a8d72b92.tar.bz2
sunxi-common.h: Use new generic $bootcmd
Use the new standard bootcmd from <config_distro_bootcmd.h>. Signed-off-by: Hans de Goede <hdegoede@redhat.com> Acked-by: Stephen Warren <swarren@nvidia.com>
-rw-r--r--include/configs/sunxi-common.h25
1 files changed, 22 insertions, 3 deletions
diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h
index 4c712f3..9bfc4ee 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 <config_cmd_default.h>
#undef CONFIG_CMD_FPGA
@@ -219,6 +216,28 @@
#ifndef CONFIG_SPL_BUILD
#include <config_distro_defaults.h>
+
+#ifdef CONFIG_AHCI
+#define BOOT_TARGET_DEVICES_SCSI(func) func(SCSI, scsi, 0)
+#else
+#define BOOT_TARGET_DEVICES_SCSI(func)
+#endif
+
+#define BOOT_TARGET_DEVICES(func) \
+ func(MMC, mmc, 0) \
+ BOOT_TARGET_DEVICES_SCSI(func) \
+ func(USB, usb, 0) \
+ func(PXE, pxe, na) \
+ func(DHCP, dhcp, na)
+
+#include <config_distro_bootcmd.h>
+
+#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 */