X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;ds=sidebyside;f=include%2Fconfigs%2Fti_omap3_common.h;h=725a5a62f5252d069128d6707f1af4b5611a291e;hb=bf2c48fa1a6e068f232d84aae43b5dad654a9017;hp=72c4b184d95b28980411b8413c97ffae0b3f3fa5;hpb=0a9ef45158d586017839d4b6fccd7f8f16672156;p=platform%2Fkernel%2Fu-boot.git diff --git a/include/configs/ti_omap3_common.h b/include/configs/ti_omap3_common.h index 72c4b18..725a5a6 100644 --- a/include/configs/ti_omap3_common.h +++ b/include/configs/ti_omap3_common.h @@ -1,10 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * ti_omap3_common.h * * Copyright (C) 2013 Texas Instruments Incorporated - http://www.ti.com/ * - * SPDX-License-Identifier: GPL-2.0+ - * * For more details, please see the technical documents listed at * http://www.ti.com/product/omap3530 * http://www.ti.com/product/omap3630 @@ -28,18 +27,18 @@ /* NS16550 Configuration */ #define V_NS16550_CLK 48000000 /* 48MHz (APLL96/2) */ #define CONFIG_SYS_NS16550_CLK V_NS16550_CLK -#ifdef CONFIG_SPL_BUILD -# define CONFIG_SYS_NS16550_SERIAL -# define CONFIG_SYS_NS16550_REG_SIZE (-4) -#endif +#if !defined(CONFIG_DM_SERIAL) +#define CONFIG_SYS_NS16550_SERIAL +#define CONFIG_SYS_NS16550_REG_SIZE (-4) +#endif /* !CONFIG_DM_SERIAL */ #define CONFIG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600, \ 115200} /* Select serial console configuration */ -#define CONFIG_CONS_INDEX 3 #ifdef CONFIG_SPL_BUILD +#define CONFIG_SYS_NS16550_COM1 OMAP34XX_UART1 +#define CONFIG_SYS_NS16550_COM2 OMAP34XX_UART2 #define CONFIG_SYS_NS16550_COM3 OMAP34XX_UART3 -#define CONFIG_SERIAL3 3 #endif /* Physical Memory Map */ @@ -56,11 +55,8 @@ #define CONFIG_SYS_MONITOR_LEN (256 << 10) /* SPL */ -#define CONFIG_SPL_TEXT_BASE 0x40200800 -#define CONFIG_SYS_SPL_ARGS_ADDR (CONFIG_SYS_SDRAM_BASE + \ - (64 << 20)) -#ifdef CONFIG_NAND +#ifdef CONFIG_MTD_RAW_NAND #define CONFIG_SYS_NAND_BASE 0x30000000 #endif