Merge git://www.denx.de/git/u-boot-marvell

[people/ms/u-boot.git] / include / configs / sniper.h

diff --git a/include/configs/sniper.h b/include/configs/sniper.h
index 08046b5e995dd62a4712e8eafe7898a138c0b18f..4d0578616910778fa6b92a9e358bb847bba5c77e 100644 (file)
--- a/include/configs/sniper.h
+++ b/include/configs/sniper.h
@@ -1,5 +1,5 @@
 /*
- * LG Optimus Black (P970) codename sniper config
+ * LG Optimus Black codename sniper config
  *
  * Copyright (C) 2015 Paul Kocialkowski <contact@paulk.fr>
  *
@@ -16,8 +16,6 @@
  * CPU
  */
 
-#define CONFIG_SYS_CACHELINE_SIZE      64
-
 #define CONFIG_ARM_ARCH_CP15_ERRATA
 #define CONFIG_ARM_ERRATA_454179
 #define CONFIG_ARM_ERRATA_430973
@@ -28,7 +26,6 @@
  */
 
 #define CONFIG_OMAP
-#define CONFIG_OMAP_COMMON
 
 /*
  * Board
@@ -61,11 +58,8 @@
  */
 
 #define CONFIG_SYS_TEXT_BASE           0x80100000
-#define CONFIG_SYS_SDRAM_BASE          OMAP34XX_SDRC_CS0
-#define CONFIG_SYS_INIT_RAM_ADDR       0x4020F800
-#define CONFIG_SYS_INIT_RAM_SIZE       0x800
-#define CONFIG_SYS_INIT_SP_ADDR                (CONFIG_SYS_INIT_RAM_ADDR + \
-                                        CONFIG_SYS_INIT_RAM_SIZE - \
+#define CONFIG_SYS_SDRAM_BASE          0x80000000
+#define CONFIG_SYS_INIT_SP_ADDR                (NON_SECURE_SRAM_END - \
                                         GENERATED_GBL_DATA_SIZE)
 
 #define CONFIG_SYS_MALLOC_LEN          (1024 * 1024 + CONFIG_ENV_SIZE)
@@ -91,8 +85,6 @@
 #define CONFIG_SYS_I2C_OMAP34XX
 #define CONFIG_I2C_MULTI_BUS
 
-#define CONFIG_CMD_I2C
-
 /*
  * Flash
  */
@@ -104,10 +96,6 @@
  */
 
 #define CONFIG_GENERIC_MMC
-#define CONFIG_MMC
-#define CONFIG_OMAP_HSMMC
-
-#define CONFIG_CMD_MMC
 
 /*
  * Power
@@ -126,20 +114,8 @@
  */
 
 #define CONFIG_PARTITION_UUIDS
-#define CONFIG_DOS_PARTITION
-#define CONFIG_EFI_PARTITION
-
 #define CONFIG_CMD_PART
 
-/*
- * Filesystems
- */
-
-#define CONFIG_CMD_FS_GENERIC
-#define CONFIG_CMD_EXT2
-#define CONFIG_CMD_EXT4
-#define CONFIG_CMD_FAT
-
 /*
  * SPL
  */
@@ -147,44 +123,25 @@
 #define CONFIG_SPL_FRAMEWORK
 
 #define CONFIG_SPL_TEXT_BASE           0x40200000
-#define CONFIG_SPL_MAX_SIZE            (54 * 1024)
+#define CONFIG_SPL_MAX_SIZE            (SRAM_SCRATCH_SPACE_ADDR - \
+                                        CONFIG_SPL_TEXT_BASE)
 #define CONFIG_SPL_BSS_START_ADDR      0x80000000
 #define CONFIG_SPL_BSS_MAX_SIZE                (512 * 1024)
 #define CONFIG_SYS_SPL_MALLOC_START    0x80208000
 #define CONFIG_SYS_SPL_MALLOC_SIZE     (1024 * 1024)
 #define CONFIG_SPL_STACK               LOW_LEVEL_SRAM_STACK
 
-#define CONFIG_SPL_LDSCRIPT            "$(CPUDIR)/omap-common/u-boot-spl.lds"
+#define CONFIG_SPL_LDSCRIPT            "arch/arm/mach-omap2/u-boot-spl.lds"
 #define CONFIG_SPL_BOARD_INIT
 
-#define CONFIG_SPL_LIBGENERIC_SUPPORT
-#define CONFIG_SPL_LIBCOMMON_SUPPORT
-#define CONFIG_SPL_LIBDISK_SUPPORT
-#define CONFIG_SPL_SERIAL_SUPPORT
-#define CONFIG_SPL_POWER_SUPPORT
-#define CONFIG_SPL_GPIO_SUPPORT
-#define CONFIG_SPL_I2C_SUPPORT
-#define CONFIG_SPL_MMC_SUPPORT
-#define CONFIG_SPL_FAT_SUPPORT
-
 #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_PARTITION     2
 
 #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION             1
 #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME                        "u-boot.img"
 
-/*
- * Console
- */
-
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV
-
-#define CONFIG_DISPLAY_CPUINFO
-#define CONFIG_DISPLAY_BOARDINFO
-
 #define CONFIG_AUTO_COMPLETE
 
 #define CONFIG_SYS_LONGHELP
-#define CONFIG_SYS_HUSH_PARSER
 
 #define CONFIG_SYS_MAXARGS     16
 #define CONFIG_SYS_CBSIZE      512
@@ -195,7 +152,6 @@
  * Serial
  */
 
-
 #ifdef CONFIG_SPL_BUILD
 #define CONFIG_SYS_NS16550_SERIAL
 #define CONFIG_SYS_NS16550_REG_SIZE    (-4)
@@ -204,7 +160,6 @@
 #define CONFIG_SYS_NS16550_CLK         V_NS16550_CLK
 #define CONFIG_SYS_NS16550_COM3                OMAP34XX_UART3
 #define CONFIG_CONS_INDEX              3
-#define CONFIG_SERIAL3                 3
 
 #define CONFIG_BAUDRATE                        115200
 #define CONFIG_SYS_BAUDRATE_TABLE      { 4800, 9600, 19200, 38400, 57600, \
@@ -218,20 +173,6 @@
 #define CONFIG_USB_MUSB_OMAP2PLUS
 #define CONFIG_TWL4030_USB
 
-#define CONFIG_USB_GADGET
-#define CONFIG_USB_GADGET_DUALSPEED
-#define CONFIG_USB_GADGET_VBUS_DRAW    0
-
-/*
- * Download
- */
-
-#define CONFIG_USB_GADGET_DOWNLOAD
-
-#define CONFIG_G_DNL_VENDOR_NUM                0x0451
-#define CONFIG_G_DNL_PRODUCT_NUM       0xd022
-#define CONFIG_G_DNL_MANUFACTURER      "Texas Instruments"
-
 /*
  * Fastboot
  */
@@ -257,16 +198,24 @@
 
 #define CONFIG_EXTRA_ENV_SETTINGS \
        "kernel_addr_r=0x82000000\0" \
+       "loadaddr=0x82000000\0" \
+       "fdt_addr_r=0x88000000\0" \
+       "fdtaddr=0x88000000\0" \
+       "ramdisk_addr_r=0x88080000\0" \
+       "pxefile_addr_r=0x80100000\0" \
+       "scriptaddr=0x80000000\0" \
+       "bootm_size=0x10000000\0" \
        "boot_mmc_dev=0\0" \
        "kernel_mmc_part=3\0" \
        "recovery_mmc_part=4\0" \
-       "bootargs=console=ttyO2 vram=5M,0x9FA00000 omapfb.vram=0:5M\0"
+       "fdtfile=omap3-sniper.dtb\0" \
+       "bootfile=/boot/extlinux/extlinux.conf\0" \
+       "bootargs=console=ttyO2,115200 vram=5M,0x9FA00000 omapfb.vram=0:5M\0"
 
 /*
- * ATAGs / Device Tree
+ * ATAGs
  */
 
-#define CONFIG_OF_LIBFDT
 #define CONFIG_SETUP_MEMORY_TAGS
 #define CONFIG_CMDLINE_TAG
 #define CONFIG_INITRD_TAG
@@ -278,7 +227,6 @@
  */
 
 #define CONFIG_SYS_LOAD_ADDR   0x82000000
-#define CONFIG_BOOTDELAY       1
 
 #define CONFIG_ANDROID_BOOT_IMAGE
 
@@ -299,5 +247,6 @@
  */
 
 #include <config_defaults.h>
+#include <config_distro_defaults.h>
 
 #endif