configs: Re-sync HUSH options

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

diff --git a/include/configs/sniper.h b/include/configs/sniper.h
index b40c4c0591fc173ed07e7c78639b2d3b3bd719e5..2785925fe35a2ca680dff028a3cb07f222095890 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>
  *
@@ -34,7 +34,6 @@
  * Board
  */
 
-#define CONFIG_SYS_GENERIC_BOARD
 #define CONFIG_MISC_INIT_R
 
 /*
@@ -62,11 +61,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)
@@ -104,8 +100,8 @@
  * MMC
  */
 
-#define CONFIG_GENERIC_MMC
 #define CONFIG_MMC
+#define CONFIG_GENERIC_MMC
 #define CONFIG_OMAP_HSMMC
 
 #define CONFIG_CMD_MMC
@@ -127,20 +123,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
  */
@@ -184,9 +168,7 @@
 
 #define CONFIG_AUTO_COMPLETE
 
-#define CONFIG_SYS_PROMPT      "Sniper # "
 #define CONFIG_SYS_LONGHELP
-#define CONFIG_SYS_HUSH_PARSER
 
 #define CONFIG_SYS_MAXARGS     16
 #define CONFIG_SYS_CBSIZE      512
@@ -197,19 +179,14 @@
  * Serial
  */
 
-
-#ifndef CONFIG_SPL_BUILD
-#define CONFIG_OMAP_SERIAL
-#else
+#ifdef CONFIG_SPL_BUILD
 #define CONFIG_SYS_NS16550_SERIAL
 #define CONFIG_SYS_NS16550_REG_SIZE    (-4)
-#define CONFIG_SYS_NS16550_CLK         V_NS16550_CLK
 #endif
 
-#define CONFIG_SYS_NS16550
+#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, \
@@ -223,20 +200,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
  */
@@ -262,16 +225,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
@@ -283,7 +254,6 @@
  */
 
 #define CONFIG_SYS_LOAD_ADDR   0x82000000
-#define CONFIG_BOOTDELAY       1
 
 #define CONFIG_ANDROID_BOOT_IMAGE
 
@@ -304,5 +274,6 @@
  */
 
 #include <config_defaults.h>
+#include <config_distro_defaults.h>
 
 #endif