Merge tag 'signed-efi-next' of git://github.com/agraf/u-boot

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

diff --git a/include/configs/pcm058.h b/include/configs/pcm058.h
index 2c1221d..9481e5b 100644 (file)
--- a/include/configs/pcm058.h
+++ b/include/configs/pcm058.h
@@ -8,8 +8,6 @@
 #ifndef __PCM058_CONFIG_H
 #define __PCM058_CONFIG_H
 
-#include <config_distro_defaults.h>
-
 #ifdef CONFIG_SPL
 #define CONFIG_SPL_SPI_LOAD
 #define CONFIG_SYS_SPI_U_BOOT_OFFS     (64 * 1024)
@@ -29,7 +27,6 @@
 #define PHYS_SDRAM_SIZE                (1u * 1024 * 1024 * 1024)
 
 /* Early setup */
-#define CONFIG_DISPLAY_BOARDINFO_LATE
 
 
 /* Size of malloc() pool */
@@ -44,7 +41,6 @@
 #define CONFIG_FEC_MXC_PHYADDR         3
 
 /* SPI Flash */
-#define CONFIG_MXC_SPI
 #define CONFIG_SF_DEFAULT_BUS          0
 #define CONFIG_SF_DEFAULT_CS           0
 #define CONFIG_SF_DEFAULT_SPEED                20000000
@@ -58,7 +54,6 @@
 
 #ifndef CONFIG_SPL_BUILD
 /* Enable NAND support */
-#define CONFIG_NAND_MXS
 #define CONFIG_SYS_MAX_NAND_DEVICE     1
 #define CONFIG_SYS_NAND_BASE           0x40000000
 #define CONFIG_SYS_NAND_5_ADDR_CYCLE
@@ -66,15 +61,10 @@
 #endif
 
 /* DMA stuff, needed for GPMI/MXS NAND support */
-#define CONFIG_APBH_DMA
-#define CONFIG_APBH_DMA_BURST
-#define CONFIG_APBH_DMA_BURST8
 
 /* Filesystem support */
 #define CONFIG_MTD_PARTITIONS
 #define CONFIG_MTD_DEVICE
-#define MTDIDS_DEFAULT    "nand0=nand"
-#define MTDPARTS_DEFAULT  "mtdparts=nand:16m(uboot),1m(env),-(rootfs)"
 
 /* Physical Memory Map */
 #define CONFIG_NR_DRAM_BANKS           1