Merge tag 'tpm-030822' of https://source.denx.de/u-boot/custodians/u-boot-tpm

[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 adfc055..97aafc5 100644 (file)
--- a/include/configs/nokia_rx51.h
+++ b/include/configs/nokia_rx51.h
@@ -43,7 +43,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,30 +69,12 @@
 
 #define CONFIG_SYS_ONENAND_BASE                ONENAND_MAP
 
-/*
- * Framebuffer
- */
-/* Video console */
-#define VIDEO_FB_16BPP_PIXEL_SWAP
-#define VIDEO_FB_16BPP_WORD_SWAP
-
-/* functions for cfb_console */
-#define VIDEO_KBD_INIT_FCT             rx51_kp_init()
-#define VIDEO_TSTC_FCT                 rx51_kp_tstc
-#define VIDEO_GETC_FCT                 rx51_kp_getc
-#ifndef __ASSEMBLY__
-struct stdio_dev;
-int rx51_kp_init(void);
-int rx51_kp_tstc(struct stdio_dev *sdev);
-int rx51_kp_getc(struct stdio_dev *sdev);
-#endif
-
 /* Environment information */
 #define CONFIG_EXTRA_ENV_SETTINGS \
        "usbtty=cdc_acm\0" \
-       "stdin=usbtty,serial,vga\0" \
-       "stdout=usbtty,serial,vga\0" \
-       "stderr=usbtty,serial,vga\0" \
+       "stdin=usbtty,serial,keyboard\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" \
@@ -172,7 +153,6 @@ int rx51_kp_getc(struct stdio_dev *sdev);
  * 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
@@ -186,8 +166,6 @@ int rx51_kp_getc(struct stdio_dev *sdev);
 #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