All of lore.kernel.org
 help / color / mirror / Atom feed
From: Hans de Goede <hdegoede@redhat.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH 5/7] sunxi-common.h: Use new generic $bootcmd
Date: Fri,  1 Aug 2014 09:46:45 +0200	[thread overview]
Message-ID: <1406879207-12322-5-git-send-email-hdegoede@redhat.com> (raw)
In-Reply-To: <1406879207-12322-1-git-send-email-hdegoede@redhat.com>

Use the new standard bootcmd from <config_distro_bootcmd.h>.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
 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 <config_cmd_default.h>
 #undef CONFIG_CMD_FPGA
 
@@ -219,6 +216,30 @@
 
 #ifndef CONFIG_SPL_BUILD
 #include <config_distro_defaults.h>
+
+#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 <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 */
-- 
2.0.3

  parent reply	other threads:[~2014-08-01  7:46 UTC|newest]

Thread overview: 33+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-08-01  7:46 [U-Boot] [PATCH 1/7] sunxi-common.h: Remove CONFIG_SYS_BOOT_GET_CMDLINE Hans de Goede
2014-08-01  7:46 ` [U-Boot] [PATCH 2/7] sunxi-common.h: Remove dead #ifdef CONFIG_CMD_NET code block Hans de Goede
2014-08-04 21:19   ` Ian Campbell
2014-08-01  7:46 ` [U-Boot] [PATCH 3/7] sunxi-common.h: Don't undefine CONFIG_CMD_NFS Hans de Goede
2014-08-04 21:19   ` Ian Campbell
2014-08-01  7:46 ` [U-Boot] [PATCH 4/7] sunxi-common.h: Don't undef CONFIG_CMD_NET only to redefine it again later Hans de Goede
2014-08-04 21:20   ` Ian Campbell
2014-08-01  7:46 ` Hans de Goede [this message]
2014-08-01  7:48   ` [U-Boot] [PATCH 5/7] sunxi-common.h: Use new generic $bootcmd Hans de Goede
2014-08-01 18:54   ` Stephen Warren
2014-08-04 18:35     ` Hans de Goede
2014-08-04 21:21       ` Ian Campbell
2014-08-01  7:46 ` [U-Boot] [PATCH 6/7] sunxi: Kconfig: move common settings into a shared code block Hans de Goede
2014-08-04 21:26   ` Ian Campbell
2014-08-05  1:24     ` Chen-Yu Tsai
2014-08-05  7:03       ` Ian Campbell
2014-08-01  7:46 ` [U-Boot] [PATCH 7/7] sunxi: Add environment settings to make extlinux.conf booting work Hans de Goede
2014-08-01 18:57   ` Stephen Warren
2014-08-01 20:05     ` Dennis Gilmore
2014-08-01 20:22       ` Stephen Warren
2014-08-01 20:30         ` Dennis Gilmore
2014-08-01 20:43         ` Tom Rini
2014-08-01 21:43           ` Stephen Warren
2014-08-02  1:53             ` Tom Rini
2014-08-04 17:31               ` Stephen Warren
2014-08-04 20:12                 ` Tom Rini
2014-08-04 21:29       ` Ian Campbell
2014-08-05  8:20         ` Hans de Goede
2014-08-04 21:27   ` Ian Campbell
2014-08-05  8:21     ` Hans de Goede
2014-08-30 21:57   ` Ian Campbell
2014-08-31 10:07     ` Hans de Goede
2014-08-04 21:17 ` [U-Boot] [PATCH 1/7] sunxi-common.h: Remove CONFIG_SYS_BOOT_GET_CMDLINE Ian Campbell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1406879207-12322-5-git-send-email-hdegoede@redhat.com \
    --to=hdegoede@redhat.com \
    --cc=u-boot@lists.denx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.