Merge tag 'efi-2020-01-rc2' of https://gitlab.denx.de/u-boot/custodians/u-boot-efi

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

diff --git a/include/configs/draco.h b/include/configs/draco.h
index a2438d883ec7730eed433959300f3e30b2bd2861..ffeb3982b5560d4c6c6d2561fc5d119f93a81c0d 100644 (file)
--- a/include/configs/draco.h
+++ b/include/configs/draco.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * (C) Copyright 2013 Siemens Schweiz AG
  * (C) Heiko Schocher, DENX Software Engineering, hs@denx.de.
@@ -6,31 +7,24 @@
  * U-Boot file:/include/configs/am335x_evm.h
  *
  * Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #ifndef __CONFIG_DRACO_H
 #define __CONFIG_DRACO_H
 
-#define CONFIG_SIEMENS_DRACO
-#define MACH_TYPE_DRACO                        4314
 #define CONFIG_SIEMENS_MACH_TYPE       MACH_TYPE_DRACO
 
 #include "siemens-am33x-common.h"
 
-#define CONFIG_SYS_MPUCLK      275
 #define DDR_PLL_FREQ   303
-#undef CONFIG_SPL_AM33XX_ENABLE_RTC32K_OSC
 
-#define BOARD_DFU_BUTTON_GPIO  27
-#define BOARD_DFU_BUTTON_LED   64      /* red LED */
-#define BOARD_STATUS_LED       103     /* green LED */
+#define BOARD_DFU_BUTTON_GPIO  27      /* Use as default */
 #define GPIO_LAN9303_NRST      88      /* GPIO2_24 = gpio88 */
 
-#undef CONFIG_DOS_PARTITION
-#undef CONFIG_CMD_FAT
-
+#define CONFIG_ENV_SETTINGS_BUTTONS_AND_LEDS \
+       "button_dfu0=27\0" \
+       "led0=103,1,0\0" \
+       "led1=64,0,1\0"
 
  /* Physical Memory Map */
 #define CONFIG_MAX_RAM_BANK_SIZE       (1024 << 20)    /* 1GB */
@@ -42,32 +36,30 @@
 #define EEPROM_ADDR_DDR3 0x90
 #define EEPROM_ADDR_CHIP 0x120
 
-#define CONFIG_SYS_U_BOOT_MAX_SIZE_SECTORS     0x300
-
-#undef CONFIG_SPL_NET_SUPPORT
-#undef CONFIG_SPL_NET_VCI_STRING
-#undef CONFIG_SPL_ETH_SUPPORT
-
-#undef CONFIG_MII
-#undef CONFIG_PHY_GIGE
 #define CONFIG_PHY_SMSC
 
 #define CONFIG_FACTORYSET
 
-/* Watchdog */
-#define CONFIG_OMAP_WATCHDOG
+/* Define own nand partitions */
+#define CONFIG_ENV_OFFSET_REDUND    0x2E0000
+#define CONFIG_ENV_SIZE_REDUND      0x2000
+#define CONFIG_ENV_RANGE        (4 * CONFIG_SYS_ENV_SECT_SIZE)
 
 #ifndef CONFIG_SPL_BUILD
 
 /* Default env settings */
 #define CONFIG_EXTRA_ENV_SETTINGS \
+       "hostname=draco\0" \
+       "ubi_off=2048\0"\
        "nand_img_size=0x400000\0" \
        "optargs=\0" \
-       CONFIG_COMMON_ENV_SETTINGS
+       "preboot=draco_led 0\0" \
+       CONFIG_ENV_SETTINGS_BUTTONS_AND_LEDS \
+       CONFIG_ENV_SETTINGS_V2 \
+       CONFIG_ENV_SETTINGS_NAND_V2
 
 #ifndef CONFIG_RESTORE_FLASH
 /* set to negative value for no autoboot */
-#define CONFIG_BOOTDELAY               3
 
 #define CONFIG_BOOTCOMMAND \
 "if dfubutton; then " \
@@ -75,11 +67,10 @@
        "reset; " \
 "fi;" \
 "run nand_boot;" \
+"run nand_boot_backup;" \
 "reset;"
 
-
 #else
-#define CONFIG_BOOTDELAY               0
 
 #define CONFIG_BOOTCOMMAND                     \
        "setenv autoload no; "                  \