| Message ID | 1511368115-14346-1-git-send-email-aford173@gmail.com |
|---|---|
| State | Rejected |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | [U-Boot] omap3_logic: Enable libfdt in SPL | expand |
On Wed, Nov 22, 2017 at 10:28 AM, Adam Ford <aford173@gmail.com> wrote: > This commit enables libfdt in SPL and removes manual MMC and serial > driver manuipluation during SPL building. > I guess I will NAK my own work. I think I misunderstood what was going on here, and it's not what I thought. Sorry for the noise. adam > Signed-off-by: Adam Ford <aford173@gmail.com> > > diff --git a/board/logicpd/omap3som/omap3logic.c b/board/logicpd/omap3som/omap3logic.c > index 1da9e38..3d6f3f8 100644 > --- a/board/logicpd/omap3som/omap3logic.c > +++ b/board/logicpd/omap3som/omap3logic.c > @@ -40,21 +40,6 @@ > > DECLARE_GLOBAL_DATA_PTR; > > -/* This is only needed until SPL gets OF support */ > -#ifdef CONFIG_SPL_BUILD > -static const struct ns16550_platdata omap3logic_serial = { > - .base = OMAP34XX_UART1, > - .reg_shift = 2, > - .clock = V_NS16550_CLK, > - .fcr = UART_FCR_DEFVAL, > -}; > - > -U_BOOT_DEVICE(omap3logic_uart) = { > - "ns16550_serial", > - &omap3logic_serial > -}; > -#endif > - > /* > * two dimensional array of strucures containining board name and Linux > * machine IDs; row it selected based on CPU column is slected based > diff --git a/configs/omap3_logic_defconfig b/configs/omap3_logic_defconfig > index 8801268..8678271 100644 > --- a/configs/omap3_logic_defconfig > +++ b/configs/omap3_logic_defconfig > @@ -55,3 +55,4 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0451 > CONFIG_USB_GADGET_PRODUCT_NUM=0xd022 > CONFIG_USB_ETHER=y > CONFIG_BCH=y > +CONFIG_SPL_OF_LIBFDT=y > diff --git a/include/configs/omap3_logic.h b/include/configs/omap3_logic.h > index 3ecfb58..29a9f70 100644 > --- a/include/configs/omap3_logic.h > +++ b/include/configs/omap3_logic.h > @@ -17,21 +17,6 @@ > > #include <configs/ti_omap3_common.h> > > -#ifdef CONFIG_SPL_BUILD > -/* > - * Disable MMC DM for SPL build and can be re-enabled after adding > - * DM support in SPL > - */ > -#undef CONFIG_DM_MMC > -#undef OMAP_HSMMC_USE_GPIO > - > -/* select serial console configuration for SPL */ > -#undef CONFIG_CONS_INDEX > -#define CONFIG_CONS_INDEX 1 > -#define CONFIG_SYS_NS16550_COM1 OMAP34XX_UART1 > -#endif > - > - > /* > * We are only ever GP parts and will utilize all of the "downloaded image" > * area in SRAM which starts at 0x40200000 and ends at 0x4020FFFF (64KB) in > -- > 2.7.4 >
diff --git a/board/logicpd/omap3som/omap3logic.c b/board/logicpd/omap3som/omap3logic.c index 1da9e38..3d6f3f8 100644 --- a/board/logicpd/omap3som/omap3logic.c +++ b/board/logicpd/omap3som/omap3logic.c @@ -40,21 +40,6 @@ DECLARE_GLOBAL_DATA_PTR; -/* This is only needed until SPL gets OF support */ -#ifdef CONFIG_SPL_BUILD -static const struct ns16550_platdata omap3logic_serial = { - .base = OMAP34XX_UART1, - .reg_shift = 2, - .clock = V_NS16550_CLK, - .fcr = UART_FCR_DEFVAL, -}; - -U_BOOT_DEVICE(omap3logic_uart) = { - "ns16550_serial", - &omap3logic_serial -}; -#endif - /* * two dimensional array of strucures containining board name and Linux * machine IDs; row it selected based on CPU column is slected based diff --git a/configs/omap3_logic_defconfig b/configs/omap3_logic_defconfig index 8801268..8678271 100644 --- a/configs/omap3_logic_defconfig +++ b/configs/omap3_logic_defconfig @@ -55,3 +55,4 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0451 CONFIG_USB_GADGET_PRODUCT_NUM=0xd022 CONFIG_USB_ETHER=y CONFIG_BCH=y +CONFIG_SPL_OF_LIBFDT=y diff --git a/include/configs/omap3_logic.h b/include/configs/omap3_logic.h index 3ecfb58..29a9f70 100644 --- a/include/configs/omap3_logic.h +++ b/include/configs/omap3_logic.h @@ -17,21 +17,6 @@ #include <configs/ti_omap3_common.h> -#ifdef CONFIG_SPL_BUILD -/* - * Disable MMC DM for SPL build and can be re-enabled after adding - * DM support in SPL - */ -#undef CONFIG_DM_MMC -#undef OMAP_HSMMC_USE_GPIO - -/* select serial console configuration for SPL */ -#undef CONFIG_CONS_INDEX -#define CONFIG_CONS_INDEX 1 -#define CONFIG_SYS_NS16550_COM1 OMAP34XX_UART1 -#endif - - /* * We are only ever GP parts and will utilize all of the "downloaded image" * area in SRAM which starts at 0x40200000 and ends at 0x4020FFFF (64KB) in
This commit enables libfdt in SPL and removes manual MMC and serial driver manuipluation during SPL building. Signed-off-by: Adam Ford <aford173@gmail.com>