Convert CONFIG_SYS_NS16550_MEM32 et al to Kconfig

[platform/kernel/u-boot.git] / include / configs / nokia_rx51.h

diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h
index 9be64c3..310bdde 100644 (file)
--- a/include/configs/nokia_rx51.h
+++ b/include/configs/nokia_rx51.h
@@ -31,8 +31,6 @@
 #define V_OSCK                 26000000        /* Clock output from T2 */
 #define V_SCLK                 (V_OSCK >> 1)
 
-#define CONFIG_UBI_SIZE                        (512 << 10)
-
 /*
  * Hardware drivers
  */
@@ -42,8 +40,6 @@
  */
 #define V_NS16550_CLK          48000000                /* 48MHz (APLL96/2) */
 
-#define CONFIG_SYS_NS16550_SERIAL
-#define CONFIG_SYS_NS16550_REG_SIZE    (-4)
 #define CONFIG_SYS_NS16550_CLK         V_NS16550_CLK
 
 /*
@@ -70,33 +66,27 @@
 
 #define CONFIG_SYS_ONENAND_BASE                ONENAND_MAP
 
-/*
- * Framebuffer
- */
-/* Video console */
-#define VIDEO_FB_16BPP_PIXEL_SWAP
-#define VIDEO_FB_16BPP_WORD_SWAP
-
 /* Environment information */
 #define CONFIG_EXTRA_ENV_SETTINGS \
        "usbtty=cdc_acm\0" \
        "stdin=usbtty,serial,keyboard\0" \
-       "stdout=usbtty,serial,vga\0" \
-       "stderr=usbtty,serial,vga\0" \
+       "stdout=usbtty,serial,vidconsole\0" \
+       "stderr=usbtty,serial,vidconsole\0" \
        "slide=gpio input " __stringify(GPIO_SLIDE) "\0" \
        "switchmmc=mmc dev ${mmcnum}\0" \
        "kernaddr=0x82008000\0" \
        "initrdaddr=0x84008000\0" \
        "scriptaddr=0x86008000\0" \
+       "fileloadaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
        "fileload=${mmctype}load mmc ${mmcnum}:${mmcpart} " \
-               "${loadaddr} ${mmcfile}\0" \
-       "kernload=setenv loadaddr ${kernaddr};" \
+               "${fileloadaddr} ${mmcfile}\0" \
+       "kernload=setenv fileloadaddr ${kernaddr};" \
                "setenv mmcfile ${mmckernfile};" \
                "run fileload\0" \
-       "initrdload=setenv loadaddr ${initrdaddr};" \
+       "initrdload=setenv fileloadaddr ${initrdaddr};" \
                "setenv mmcfile ${mmcinitrdfile};" \
                "run fileload\0" \
-       "scriptload=setenv loadaddr ${scriptaddr};" \
+       "scriptload=setenv fileloadaddr ${scriptaddr};" \
                "setenv mmcfile ${mmcscriptfile};" \
                "run fileload\0" \
        "scriptboot=echo Running ${mmcscriptfile} from mmc " \
@@ -161,7 +151,6 @@
  * This rate is divided by a local divisor.
  */
 #define CONFIG_SYS_TIMERBASE           (OMAP34XX_GPT2)
-#define CONFIG_SYS_PTV                 2       /* Divisor: 2^(PTV+1) => 8 */
 
 /*
  * Physical Memory Map
@@ -175,8 +164,6 @@
 #define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM_1
 #define CONFIG_SYS_INIT_RAM_ADDR       0x4020f800
 #define CONFIG_SYS_INIT_RAM_SIZE       0x800
-#define CONFIG_SYS_INIT_SP_ADDR                (CONFIG_SYS_INIT_RAM_ADDR + \
-                       CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE)
 
 /*
  * Attached kernel image