Skip to contentSkip to conversation

igep00x0: Do not include config_distro_defaults.h directly

PATCH New Ladislav Michl 2 participants 3 messages Dec 30, 2015 – Jan 2, 2016

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 igep00x0: Do not include config_distro_defaults.h directly

File is already included:
omap3_igep00x0.h -> ti_omap3_common.h -> ti_armv7_omap.h -> ti_armv7_common.h -> config_distro_defaults.h

---
 include/configs/omap3_igep00x0.h | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)
include/configs/omap3_igep00x0.h +3 -7
index cf2bc3e..a64b38f 100644
@@ -43,7 +43,7 @@
 #else
 #error "status LED not defined for this machine."
 #endif
-#define RED_LED_DEV				0
+#define RED_LED_DEV			0
 #define STATUS_LED_BIT			RED_LED_GPIO
 #define STATUS_LED_STATE		STATUS_LED_ON
 #define STATUS_LED_PERIOD		(CONFIG_SYS_HZ / 2)
@@ -56,7 +56,7 @@
 #define CONFIG_OMAP3_GPIO_6		/* GPIO160..191 is in GPIO bank 6 */
 
 /* USB */
-#define CONFIG_USB_MUSB_UDC			1
+#define CONFIG_USB_MUSB_UDC		1
 #define CONFIG_USB_OMAP3		1
 #define CONFIG_TWL4030_USB		1
 
@@ -81,12 +81,8 @@
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_PING
 
-/*#undef CONFIG_ENV_IS_NOWHERE*/
-
 #ifndef CONFIG_SPL_BUILD
 
-#include <config_distro_defaults.h>
-
 /* Environment */
 #define ENV_DEVICE_SETTINGS \
 	"stdin=serial\0" \
@@ -138,7 +134,7 @@
 #if defined(CONFIG_CMD_NET)
 #define CONFIG_SMC911X
 #define CONFIG_SMC911X_32_BIT
-#define CONFIG_SMC911X_BASE	0x2C000000
+#define CONFIG_SMC911X_BASE		0x2C000000
 #endif /* (CONFIG_CMD_NET) */
 
 /* OneNAND boot config */
Signature · 1 line
2.1.4
#1 lore raw

PATCH 1/1 igep00x0: Do not include config_distro_defaults.h directly

Hi Ladislav,

Thanks for the patch, some comments below

2015-12-30 2:50 GMT+01:00 Ladislav Michl <[email protected]>:

Quoted 14 lines

File is already included:
omap3_igep00x0.h -> ti_omap3_common.h -> ti_armv7_omap.h -> ti_armv7_common.h -> config_distro_defaults.h

---
 include/configs/omap3_igep00x0.h | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)
include/configs/omap3_igep00x0.h +0 -0
index cf2bc3e..a64b38f 100644

include/configs/omap3_igep00x0.h line 46

Quoted 5 lines
include/configs/omap3_igep00x0.h +1 -1
@@ -43,7 +43,7 @@
 #else
 #error "status LED not defined for this machine."
 #endif
-#define RED_LED_DEV                            0
+#define RED_LED_DEV                    0

any reason for this change ?

include/configs/omap3_igep00x0.h line 59

Quoted 9 lines
include/configs/omap3_igep00x0.h +1 -1
 #define STATUS_LED_BIT                 RED_LED_GPIO
 #define STATUS_LED_STATE               STATUS_LED_ON
 #define STATUS_LED_PERIOD              (CONFIG_SYS_HZ / 2)
@@ -56,7 +56,7 @@
 #define CONFIG_OMAP3_GPIO_6            /* GPIO160..191 is in GPIO bank 6 */
 
 /* USB */
-#define CONFIG_USB_MUSB_UDC                    1
+#define CONFIG_USB_MUSB_UDC            1

and this ?

include/configs/omap3_igep00x0.h line 85

Quoted 9 lines
include/configs/omap3_igep00x0.h +0 -2
 #define CONFIG_USB_OMAP3               1
 #define CONFIG_TWL4030_USB             1
 
@@ -81,12 +81,8 @@
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_PING
 
-/*#undef CONFIG_ENV_IS_NOWHERE*/
-

and this ?

include/configs/omap3_igep00x0.h line 137

Quoted 13 lines
include/configs/omap3_igep00x0.h +1 -3
 #ifndef CONFIG_SPL_BUILD
 
-#include <config_distro_defaults.h>
-
 /* Environment */
 #define ENV_DEVICE_SETTINGS \
        "stdin=serial\0" \
@@ -138,7 +134,7 @@
 #if defined(CONFIG_CMD_NET)
 #define CONFIG_SMC911X
 #define CONFIG_SMC911X_32_BIT
-#define CONFIG_SMC911X_BASE    0x2C000000
+#define CONFIG_SMC911X_BASE            0x2C000000

again, any reason for this change?

Quoted 10 lines
include/configs/omap3_igep00x0.h +0 -1
 #endif /* (CONFIG_CMD_NET) */
 
 /* OneNAND boot config */
--

2.1.4

_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

Also, can you send this patch and the other patch (igep00x0: cleanup ethernet support) as numbered patch series?

Thanks,

Enric

#2 lore raw

PATCH 1/1 igep00x0: Do not include config_distro_defaults.h directly

Hi Enric Balletbo,

On Wed, Dec 30, 2015 at 10:34:28PM +0100, Enric Balletbo Serra wrote:
[indentation changes snipped]

Quoted 1 line

again, any reason for this change?

I'm sure you know there is no other reason, but to indent constants to the same column with others. I did that in one patch as it is also no-op change and I was lazy to split it to separate patch. All that igep00x0 patches are just side-products of an effort to use UBI volumes for
everything: U-Boot, its environment, kernel and filesystem.

Quoted 2 lines

Also, can you send this patch and the other patch (igep00x0: cleanup ethernet support) as numbered patch series?

Sure, but could you take a look or even give a try to that second half of patches? These makes things much more interesting..

Quoted 3 lines

Thanks,

Enric

ladis