ARM: imx6: clocks: remove function local definitions of mxc_ccm_reg and anatop_regs

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

diff --git a/include/configs/peach-pi.h b/include/configs/peach-pi.h
index a1c980d320259a380465a934d190e71538a4e0c1..6c42aaac0e596a0fda8cf69e241dea616b364609 100644 (file)
--- a/include/configs/peach-pi.h
+++ b/include/configs/peach-pi.h
@@ -9,17 +9,17 @@
 #ifndef __CONFIG_PEACH_PI_H
 #define __CONFIG_PEACH_PI_H
 
-#define CONFIG_ENV_IS_IN_SPI_FLASH
-#define CONFIG_SPI_FLASH
-#define CONFIG_ENV_SPI_BASE    0x12D30000
-#define FLASH_SIZE             (0x4 << 20)
-#define CONFIG_ENV_OFFSET      (FLASH_SIZE - CONFIG_BL2_SIZE)
-#define CONFIG_SPI_BOOTING
+#define MEM_LAYOUT_ENV_SETTINGS \
+       "bootm_size=0x10000000\0" \
+       "kernel_addr_r=0x22000000\0" \
+       "fdt_addr_r=0x23000000\0" \
+       "ramdisk_addr_r=0x23300000\0" \
+       "scriptaddr=0x30000000\0" \
+       "pxefile_addr_r=0x31000000\0"
 
 #include <configs/exynos5420-common.h>
 #include <configs/exynos5-dt-common.h>
-
-#define CONFIG_BOARD_COMMON
+#include <configs/exynos5-common.h>
 
 #define CONFIG_SYS_SDRAM_BASE  0x20000000
 #define CONFIG_SYS_TEXT_BASE   0x23E00000
@@ -29,11 +29,8 @@
 #define CONFIG_SERIAL3         /* use SERIAL 3 */
 #define CONFIG_DEFAULT_CONSOLE "console=ttySAC1,115200n8\0"
 
-#define CONFIG_SYS_PROMPT      "Peach-Pi # "
 #define CONFIG_IDENT_STRING    " for Peach-Pi"
 
-#define CONFIG_VIDEO_PARADE
-
 /* Display */
 #define CONFIG_LCD
 #ifdef CONFIG_LCD
@@ -43,11 +40,6 @@
 #endif
 
 #define CONFIG_POWER_TPS65090_EC
-#define CONFIG_CROS_EC_SPI             /* Support CROS_EC over SPI */
-#define CONFIG_DM_CROS_EC
-
-#define CONFIG_USB_XHCI
-#define CONFIG_USB_XHCI_EXYNOS
 
 /* DRAM Memory Banks */
 #define CONFIG_NR_DRAM_BANKS   7