From 6931ab2fb48d2c36c815b832ede6d21596e3312a Mon Sep 17 00:00:00 2001 From: Adam Ford Date: Wed, 27 Dec 2017 13:39:56 -0600 Subject: [PATCH] ARM: omap3_logic: Enable SPL_OF_CONTROL and SPL_OF_PLATDATA The SPL doesn't have much room, so in order to support OF_CONTROL in SPL, we need the extra functionality of SPL_OF_PLATDATA. Adding these features allows us to remove a small part of code without losing the serial port during SPL. Signed-off-by: Adam Ford --- board/logicpd/omap3som/omap3logic.c | 15 --------------- configs/omap3_logic_defconfig | 3 +++ 2 files changed, 3 insertions(+), 15 deletions(-) diff --git a/board/logicpd/omap3som/omap3logic.c b/board/logicpd/omap3som/omap3logic.c index b30fa24a32..4cbbf96faa 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 db72e6f6a8..5590b9a916 100644 --- a/configs/omap3_logic_defconfig +++ b/configs/omap3_logic_defconfig @@ -29,6 +29,8 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=omap2-nand.0:512k(MLO),1792k(u-boot),128k(spl- CONFIG_CMD_UBI=y CONFIG_ISO_PARTITION=y CONFIG_OF_CONTROL=y +CONFIG_SPL_OF_CONTROL=y +CONFIG_SPL_OF_PLATDATA=y CONFIG_ENV_IS_IN_NAND=y # CONFIG_BLK is not set CONFIG_DM_I2C=y @@ -56,3 +58,4 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0451 CONFIG_USB_GADGET_PRODUCT_NUM=0xd022 CONFIG_USB_ETHER=y CONFIG_BCH=y +# CONFIG_SPL_OF_LIBFDT is not set -- 2.30.2