colibri_imx6: fix video stdout in default environment

[oweals/u-boot.git] / include / configs / ax25-ae350.h

diff --git a/include/configs/ax25-ae350.h b/include/configs/ax25-ae350.h
index e3eb92832ad8bd4c94d75f4674e7c4947408ed37..34fc6b616e7b4608df31dc04b4e991410b29a213 100644 (file)
--- a/include/configs/ax25-ae350.h
+++ b/include/configs/ax25-ae350.h
@@ -7,6 +7,23 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
+#ifdef CONFIG_SPL
+#define CONFIG_SPL_MAX_SIZE            0x00100000
+#define CONFIG_SPL_BSS_START_ADDR      0x04000000
+#define CONFIG_SPL_BSS_MAX_SIZE                0x00100000
+
+#ifndef CONFIG_XIP
+#define CONFIG_SPL_LOAD_FIT_ADDRESS    0x00200000
+#else
+#define CONFIG_SPL_LOAD_FIT_ADDRESS    0x80010000
+#endif
+
+#ifdef CONFIG_SPL_MMC_SUPPORT
+#define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION     1
+#define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME                "u-boot.itb"
+#endif
+#endif
+
 /*
  * CPU and Board Configuration Options
  */
@@ -40,7 +57,7 @@
 #define CONFIG_SYS_MALLOC_LEN   (512 << 10)
 
 /* DT blob (fdt) address */
-#define CONFIG_SYS_FDT_BASE            0x000f0000
+#define CONFIG_SYS_FDT_BASE            0x800f0000
 
 /*
  * Physical Memory Map
@@ -74,8 +91,6 @@
 /*
  * memtest works on 512 MB in DRAM
  */
-#define CONFIG_SYS_MEMTEST_START       PHYS_SDRAM_0
-#define CONFIG_SYS_MEMTEST_END         (PHYS_SDRAM_0 + PHYS_SDRAM_0_SIZE)
 
 /*
  * FLASH and environment organization
@@ -113,18 +128,9 @@
 #define CONFIG_SYS_MAX_FLASH_SECT      512
 
 /* environments */
-#define CONFIG_ENV_SPI_BUS             0
-#define CONFIG_ENV_SPI_CS              0
-#define CONFIG_ENV_SPI_MAX_HZ          50000000
-#define CONFIG_ENV_SPI_MODE            0
-#define CONFIG_ENV_SECT_SIZE           0x1000
 #define CONFIG_ENV_OVERWRITE
 
 /* SPI FLASH */
-#define CONFIG_SF_DEFAULT_BUS          0
-#define CONFIG_SF_DEFAULT_CS           0
-#define CONFIG_SF_DEFAULT_SPEED                1000000
-#define CONFIG_SF_DEFAULT_MODE         0
 
 /*
  * For booting Linux, the board info and command line data
@@ -138,7 +144,6 @@
 #define CONFIG_SYS_BOOTM_LEN   (64 << 20)
 
 /* When we use RAM as ENV */
-#define CONFIG_ENV_SIZE 0x2000
 
 /* Enable distro boot */
 #define BOOT_TARGET_DEVICES(func) \