| Message ID | 20190529204253.2061-1-aford173@gmail.com |
|---|---|
| State | Accepted |
| Commit | 33ac2b560b58dd71d485618f70768e5c2d47c678 |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | [U-Boot,V2] arm: omap3: Manually initialize GPIO if OF_CONTROL doesn't | expand |
On Wed, May 29, 2019 at 03:42:53PM -0500, Adam Ford wrote: > The commong initialization code manually initializes the GPIO > even when OF_CONTROL does it, so we can reduce the code size a > bit by not doing it manually when we have device tree support. > > Using the omap3_logic board (dm3730), the sizes shrunk: > > Before: > > text data bss dec hex filename > 561066 28596 116880 706542 ac7ee u-boot > 55245 1605 1888 58738 e572 spl/u-boot-spl > > After > text data bss dec hex filename > 560898 28548 116872 706318 ac70e u-boot > 55121 1557 1888 58566 e4c6 spl/u-boot-spl > > Signed-off-by: Adam Ford <aford173@gmail.com> Applied to u-boot/master, thanks!
diff --git a/arch/arm/mach-omap2/omap3/board.c b/arch/arm/mach-omap2/omap3/board.c index 2d25fc60a0..658ef8c1f1 100644 --- a/arch/arm/mach-omap2/omap3/board.c +++ b/arch/arm/mach-omap2/omap3/board.c @@ -34,6 +34,8 @@ static void omap3_invalidate_l2_cache_secure(void); #endif #ifdef CONFIG_DM_GPIO +#if !CONFIG_IS_ENABLED(OF_CONTROL) +/* Manually initialize GPIO banks when OF_CONTROL doesn't */ static const struct omap_gpio_platdata omap34xx_gpio[] = { { 0, OMAP34XX_GPIO1_BASE }, { 1, OMAP34XX_GPIO2_BASE }, @@ -51,7 +53,7 @@ U_BOOT_DEVICES(omap34xx_gpios) = { { "gpio_omap", &omap34xx_gpio[4] }, { "gpio_omap", &omap34xx_gpio[5] }, }; - +#endif #else static const struct gpio_bank gpio_bank_34xx[6] = {
The commong initialization code manually initializes the GPIO even when OF_CONTROL does it, so we can reduce the code size a bit by not doing it manually when we have device tree support. Using the omap3_logic board (dm3730), the sizes shrunk: Before: text data bss dec hex filename 561066 28596 116880 706542 ac7ee u-boot 55245 1605 1888 58738 e572 spl/u-boot-spl After text data bss dec hex filename 560898 28548 116872 706318 ac70e u-boot 55121 1557 1888 58566 e4c6 spl/u-boot-spl Signed-off-by: Adam Ford <aford173@gmail.com> --- V2: Fix accidentally checked in #if 1 instead of what I wanted