Merge branch 'tx53-bugfix'

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

diff --git a/include/configs/pxm2.h b/include/configs/pxm2.h
index 946b2c85e9dd4d04e68051b6b34875cb06f1b398..d896bca68b28030551e335c1265fc213154a148e 100644 (file)
--- a/include/configs/pxm2.h
+++ b/include/configs/pxm2.h
@@ -25,11 +25,14 @@
 #define DDR_PLL_FREQ           266
 
 #define BOARD_DFU_BUTTON_GPIO  59
-#define BOARD_DFU_BUTTON_LED   117
 #define BOARD_LCD_POWER                111
 #define BOARD_BACK_LIGHT       112
 #define BOARD_TOUCH_POWER      57
 
+#define CONFIG_ENV_SETTINGS_BUTTONS_AND_LEDS \
+       "button_dfu0=59\0" \
+       "led0=117,0,1\0" \
+
  /* Physical Memory Map */
 #define CONFIG_MAX_RAM_BANK_SIZE       (512 << 20)     /* 1GB */
 
@@ -48,29 +51,25 @@
 
 #define CONFIG_FACTORYSET
 
-/* UBI Support */
-#ifndef CONFIG_SPL_BUILD
-#define CONFIG_CMD_MTDPARTS
-#define CONFIG_MTD_PARTITIONS
-#define CONFIG_MTD_DEVICE
-#define CONFIG_RBTREE
-#define CONFIG_LZO
-#define CONFIG_CMD_UBI
-#define CONFIG_CMD_UBIFS
-#endif
 
 /* Watchdog */
 #define CONFIG_OMAP_WATCHDOG
 
 #ifndef CONFIG_SPL_BUILD
 
+/* Use common default */
+#define MTDPARTS_DEFAULT       MTDPARTS_DEFAULT_V1
+
 /* Default env settings */
 #define CONFIG_EXTRA_ENV_SETTINGS \
        "hostname=pxm2\0" \
        "nand_img_size=0x500000\0" \
        "optargs=\0" \
+       "preboot=draco_led 0\0" \
+       CONFIG_ENV_SETTINGS_BUTTONS_AND_LEDS \
        "splashpos=m,m\0"       \
-       CONFIG_COMMON_ENV_SETTINGS \
+       CONFIG_ENV_SETTINGS_V1 \
+       CONFIG_ENV_SETTINGS_NAND_V1 \
        "mmc_dev=0\0" \
        "mmc_root=/dev/mmcblk0p2 rw\0" \
        "mmc_root_fs_type=ext4 rootwait\0" \