vexpress64: use uncompressed kernel by default

[karo-tx-uboot.git] / include / configs / tx28.h

diff --git a/include/configs/tx28.h b/include/configs/tx28.h
index fe7cd1916e9e568f8540e82a7b4e1131f154b012..565f7610c3beb8f0808469c3efd1ad1cca948c9e 100644 (file)
--- a/include/configs/tx28.h
+++ b/include/configs/tx28.h
@@ -8,8 +8,6 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#define CONFIG_MX28                    /* must be defined before including regs-base.h */
-
 #include <linux/sizes.h>
 #include <asm/arch/regs-base.h>
 
@@ -18,7 +16,7 @@
  */
 #define CONFIG_MXS_GPIO                                        /* GPIO control */
 #define CONFIG_SYS_HZ                  1000            /* Ticks per second */
-#define PHYS_SDRAM_1_SIZE              CONFIG_SDRAM_SIZE
+#define PHYS_SDRAM_1_SIZE              CONFIG_SYS_SDRAM_SIZE
 #ifdef CONFIG_TX28_S
 #define TX28_MOD_SUFFIX                        "1"
 #else
@@ -36,9 +34,9 @@
 #define CONFIG_DISPLAY_BOARDINFO
 #define CONFIG_BOARD_LATE_INIT
 #define CONFIG_BOARD_EARLY_INIT_F
+#define CONFIG_SYS_GENERIC_BOARD
 
 /* LCD Logo and Splash screen support */
-#define CONFIG_LCD
 #ifdef CONFIG_LCD
 #define CONFIG_SPLASH_SCREEN
 #define CONFIG_SPLASH_SCREEN_ALIGN
@@ -105,7 +103,7 @@
 #else
 #define CONFIG_LOADADDR                        43000000
 #endif
-#define CONFIG_FDTADDR                 41000000
+#define CONFIG_FDTADDR                 40800000
 #define CONFIG_SYS_LOAD_ADDR           _pfx(0x, CONFIG_LOADADDR)
 #define CONFIG_SYS_FDT_ADDR            _pfx(0x, CONFIG_FDTADDR)
 #define CONFIG_U_BOOT_IMG_SIZE         SZ_1M
@@ -158,11 +156,6 @@
 #define MTD_NAME                       "gpmi-nand"
 #define MTDIDS_DEFAULT                 "nand0=" MTD_NAME
 
-/*
- * U-Boot Commands
- */
-#include <config_cmd_default.h>
-
 /*
  * Serial Driver
  */
@@ -184,19 +177,11 @@
 #define CONFIG_SYS_ARM_CACHE_WRITETHROUGH
 #define CONFIG_SYS_CACHELINE_SIZE      32
 
-#ifndef CONFIG_TX28_S
-#else
+#ifdef CONFIG_FEC_MXC_PHYADDR
 #define IMX_FEC_BASE                   MXS_ENET0_BASE
 #endif
 
 #define CONFIG_FEC_XCV_TYPE            RMII
-#define CONFIG_NET_MULTI
-#define CONFIG_CMD_MII
-/* Add for working with "strict" DHCP server */
-#define CONFIG_BOOTP_SUBNETMASK
-#define CONFIG_BOOTP_GATEWAY
-#define CONFIG_BOOTP_DNS
-#define CONFIG_BOOTP_RANDOM_ID
 #endif
 
 #ifndef CONFIG_ENV_IS_NOWHERE
@@ -208,12 +193,8 @@
 /*
  * NAND flash driver
  */
-#ifdef CONFIG_CMD_NAND
+#ifdef CONFIG_NAND
 #define CONFIG_SYS_NAND_BLOCK_SIZE     SZ_128K
-#define CONFIG_NAND_MXS
-#define CONFIG_APBH_DMA
-#define CONFIG_APBH_DMA_BURST
-#define CONFIG_APBH_DMA_BURST8
 #define CONFIG_SYS_NAND_U_BOOT_OFFS    CONFIG_SYS_NAND_BLOCK_SIZE
 #define CONFIG_SYS_MXS_DMA_CHANNEL     4
 #define CONFIG_SYS_NAND_MAX_CHIPS      0x1
@@ -246,10 +227,8 @@
  * MMC Driver
  */
 #ifdef CONFIG_CMD_MMC
-#define CONFIG_MXS_MMC
 #define CONFIG_BOUNCE_BUFFER
 
-#define CONFIG_DOS_PARTITION
 #define CONFIG_CMD_FAT
 #define CONFIG_FAT_WRITE
 #define CONFIG_CMD_EXT2
@@ -285,7 +264,6 @@
                                        GENERATED_GBL_DATA_SIZE)
 
 /* Defines for SPL */
-#define CONFIG_SPL
 #define CONFIG_SPL_START_S_PATH                "arch/arm/cpu/arm926ejs/mxs"
 #define CONFIG_SPL_LDSCRIPT            "arch/arm/cpu/arm926ejs/mxs/u-boot-spl.lds"
 #define CONFIG_SPL_LIBCOMMON_SUPPORT
@@ -293,7 +271,8 @@
 #define CONFIG_SPL_SERIAL_SUPPORT
 #define CONFIG_SPL_GPIO_SUPPORT
 #define CONFIG_SYS_SPL_VDDD_VAL                1500
-#define CONFIG_SYS_SPL_BATT_BO_LEVEL   2800
+#define CONFIG_SYS_SPL_BATT_BO_LEVEL   2400
+#define CONFIG_SYS_SPL_VDDA_BO_VAL     100
 #define CONFIG_SYS_SPL_VDDMEM_VAL      0       /* VDDMEM is not utilized on TX28 */
 
 #endif /* __CONFIGS_TX28_H */