From: Tom Rini <trini@konsulko.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH 2/4] omap3_igep00x0: Rework MACH_TYPE and status LED logic slightly
Date: Tue, 10 Jan 2017 17:22:06 -0500 [thread overview]
Message-ID: <1484086928-2586-2-git-send-email-trini@konsulko.com> (raw)
In-Reply-To: <1484086928-2586-1-git-send-email-trini@konsulko.com>
The MACH_TYPE for IGEP0032 was never officially used and has been
removed from upstream, so we must not use it. In order to remove this
we need to rework the status LED logic.
Cc: Enric Balletbo i Serra <eballetbo@gmail.com>
Signed-off-by: Tom Rini <trini@konsulko.com>
---
configs/igep0032_defconfig | 1 -
include/configs/omap3_igep00x0.h | 5 ++---
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/configs/igep0032_defconfig b/configs/igep0032_defconfig
index dad8dfaf0c22..cd48e45171cb 100644
--- a/configs/igep0032_defconfig
+++ b/configs/igep0032_defconfig
@@ -3,7 +3,6 @@ CONFIG_OMAP34XX=y
# CONFIG_SPL_EXT_SUPPORT is not set
CONFIG_TARGET_OMAP3_IGEP00X0=y
CONFIG_DISTRO_DEFAULTS=y
-CONFIG_SYS_EXTRA_OPTIONS="MACH_TYPE=MACH_TYPE_IGEP0032"
CONFIG_BOOTDELAY=3
CONFIG_SYS_CONSOLE_IS_IN_ENV=y
CONFIG_SYS_CONSOLE_INFO_QUIET=y
diff --git a/include/configs/omap3_igep00x0.h b/include/configs/omap3_igep00x0.h
index 30d3aa897f1b..e6d7db0da692 100644
--- a/include/configs/omap3_igep00x0.h
+++ b/include/configs/omap3_igep00x0.h
@@ -28,7 +28,8 @@
#define CONFIG_REVISION_TAG 1
/* Status LED available for IGEP0020 and IGEP0030 but not IGEP0032 */
-#if (CONFIG_MACH_TYPE != MACH_TYPE_IGEP0032)
+#if (CONFIG_MACH_TYPE == MACH_TYPE_IGEP0020) || \
+ (CONFIG_MACH_TYPE == MACH_TYPE_IGEP0030)
#define CONFIG_STATUS_LED
#define CONFIG_BOARD_SPECIFIC_LED
#define CONFIG_GPIO_LED
@@ -36,8 +37,6 @@
#define RED_LED_GPIO 27
#elif (CONFIG_MACH_TYPE == MACH_TYPE_IGEP0030)
#define RED_LED_GPIO 16
-#else
-#error "status LED not defined for this machine."
#endif
#define RED_LED_DEV 0
#define STATUS_LED_BIT RED_LED_GPIO
--
1.9.1
next prev parent reply other threads:[~2017-01-10 22:22 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-10 22:22 [U-Boot] [PATCH 1/4] omap3_logic: Rework MACH_TYPE and fdtfile logic Tom Rini
2017-01-10 22:22 ` Tom Rini [this message]
2017-01-11 14:59 ` [U-Boot] [PATCH 2/4] omap3_igep00x0: Rework MACH_TYPE and status LED logic slightly Enric Balletbo Serra
2017-01-11 15:05 ` Tom Rini
2017-01-11 15:10 ` Enric Balletbo Serra
2017-01-14 20:57 ` [U-Boot] [U-Boot, " Tom Rini
2017-01-10 22:22 ` [U-Boot] [PATCH 3/4] arm: Remove unregister MACH_TYPE_xxx uses Tom Rini
2017-01-11 0:14 ` Stephen Warren
2017-01-11 1:22 ` Tom Rini
2017-01-14 20:57 ` [U-Boot] [U-Boot, " Tom Rini
2017-01-10 22:22 ` [U-Boot] [PATCH 4/4] arm: Re-sync asm/mach-types.h with Linux Kernel v4.9 Tom Rini
2017-01-11 14:30 ` Adam Ford
2017-01-14 20:57 ` [U-Boot] [U-Boot, " Tom Rini
2017-01-11 13:38 ` [U-Boot] [PATCH 1/4] omap3_logic: Rework MACH_TYPE and fdtfile logic Adam Ford
2017-01-14 20:57 ` [U-Boot] [U-Boot, " Tom Rini
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=1484086928-2586-2-git-send-email-trini@konsulko.com \
--to=trini@konsulko.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox