X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=include%2Fconfigs%2Fnokia_rx51.h;h=453dd32fbdc4ec018d462cbcf82ab77b20ec4e50;hb=3d5ced9e22d32112a20f9dc0f5fb1f22ef088079;hp=20b8c345f06620210d4852f547b1e64c54e48904;hpb=2dc5b553b9bcd701bd7abd60f99f407cb0c37762;p=platform%2Fkernel%2Fu-boot.git diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h index 20b8c34..453dd32 100644 --- a/include/configs/nokia_rx51.h +++ b/include/configs/nokia_rx51.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * (C) Copyright 2011-2012 * Pali Rohár @@ -12,8 +13,6 @@ * Syed Mohammed Khasim * * Configuration settings for the Nokia RX-51 aka N900. - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __CONFIG_H @@ -31,7 +30,6 @@ * NOLO loading boot image to random place, so it doesn't really * matter what we set this to. We have to copy u-boot to this address */ -#define CONFIG_SYS_TEXT_BASE 0x80008000 #include /* get chip and board defs */ #include @@ -42,7 +40,6 @@ #define V_OSCK 26000000 /* Clock output from T2 */ #define V_SCLK (V_OSCK >> 1) -#define CONFIG_MISC_INIT_R #define CONFIG_SKIP_LOWLEVEL_INIT /* X-Loader set everything up */ #define CONFIG_CMDLINE_TAG /* enable passing kernel command line string */ @@ -74,20 +71,12 @@ /* * select serial console configuration */ -#define CONFIG_CONS_INDEX 3 #define CONFIG_SYS_NS16550_COM3 OMAP34XX_UART3 -#define CONFIG_SERIAL3 3 /* UART3 on RX-51 */ /* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE #define CONFIG_SYS_BAUDRATE_TABLE { 4800, 9600, 19200, 38400, 57600, 115200 } -/* USB */ -#define CONFIG_USB_MUSB_UDC -#define CONFIG_USB_MUSB_HCD -#define CONFIG_USB_OMAP3 -#define CONFIG_TWL4030_USB - /* USB device configuration */ #define CONFIG_USB_DEVICE #define CONFIG_USBD_VENDORID 0x0421 @@ -97,18 +86,11 @@ /* commands to include */ -#define CONFIG_CMDLINE_EDITING /* add command line history */ -#define CONFIG_AUTO_COMPLETE /* add autocompletion support */ - #define CONFIG_SYS_I2C -#define CONFIG_SYS_OMAP24_I2C_SPEED 100000 -#define CONFIG_SYS_OMAP24_I2C_SLAVE 1 /* * TWL4030 */ -#define CONFIG_TWL4030_LED -#define CONFIG_TWL4030_KEYPAD #define GPIO_SLIDE 71 @@ -161,17 +143,6 @@ #ifdef ONENAND_SUPPORT #define CONFIG_SYS_ONENAND_BASE ONENAND_MAP -#define CONFIG_MTD_DEVICE -#define CONFIG_MTD_PARTITIONS - -#define MTDIDS_DEFAULT "onenand0=onenand" -#define MTDPARTS_DEFAULT "mtdparts=onenand:" \ - __stringify(PART1_SIZE) PART1_SUFF "(" PART1_NAME ")ro," \ - __stringify(PART2_SIZE) PART2_SUFF "(" PART2_NAME ")," \ - __stringify(PART3_SIZE) PART3_SUFF "(" PART3_NAME ")," \ - __stringify(PART4_SIZE) PART4_SUFF "(" PART4_NAME ")," \ - __stringify(PART5_SIZE) PART5_SUFF "(" PART5_NAME ")," \ - "-(" PART6_NAME ")" #endif @@ -198,13 +169,14 @@ int rx51_kp_tstc(struct stdio_dev *sdev); int rx51_kp_getc(struct stdio_dev *sdev); #endif -#ifndef MTDPARTS_DEFAULT -#define MTDPARTS_DEFAULT -#endif - /* Environment information */ +#ifdef CONFIG_MTDPARTS_DEFAULT +#define MTDPARTS "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" +#else +#define MTDPARTS +#endif #define CONFIG_EXTRA_ENV_SETTINGS \ - "mtdparts=" MTDPARTS_DEFAULT "\0" \ + MTDPARTS \ "usbtty=cdc_acm\0" \ "stdin=vga\0" \ "stdout=vga\0" \ @@ -328,7 +300,6 @@ int rx51_kp_getc(struct stdio_dev *sdev); /* * Miscellaneous configurable options */ -#define CONFIG_SYS_LONGHELP /* undef to save memory */ #define CONFIG_SYS_MEMTEST_START (OMAP34XX_SDRC_CS0) #define CONFIG_SYS_MEMTEST_END (OMAP34XX_SDRC_CS0 + 0x01F00000)/*31MB*/ @@ -347,7 +318,6 @@ int rx51_kp_getc(struct stdio_dev *sdev); /* * Physical Memory Map */ -#define CONFIG_NR_DRAM_BANKS 2 #define PHYS_SDRAM_1 OMAP34XX_SDRC_CS0 /*