Skip to contentSkip to conversation

omap3_logic: Enable libfdt in SPL

PATCH New Adam Ford 1 participant 2 messages Nov 22, 2017 – Nov 29, 2017

lore
Share & tools
lore

Adam Ford

author
#0 lore raw

PATCH 1/1 omap3_logic: Enable libfdt in SPL

This commit enables libfdt in SPL and removes manual MMC and serial driver manuipluation during SPL building.

board/logicpd/omap3som/omap3logic.c +0 -15
index 1da9e38..3d6f3f8 100644
@@ -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
configs/omap3_logic_defconfig +1 -0
index 8801268..8678271 100644
@@ -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
include/configs/omap3_logic.h +0 -15
index 3ecfb58..29a9f70 100644
@@ -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
Signature · 1 line
2.7.4
author
#1 lore raw

PATCH 1/1 omap3_logic: Enable libfdt in SPL

Quoted 3 lines · Adam Ford

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

Quoted 66 lines
board/logicpd/omap3som/omap3logic.c +0 -15
index 1da9e38..3d6f3f8 100644
@@ -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
configs/omap3_logic_defconfig +1 -0
index 8801268..8678271 100644
@@ -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
include/configs/omap3_logic.h +0 -16
index 3ecfb58..29a9f70 100644
@@ -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