siemens,am33x,rastaban: add rastaban config

rastaban is a draco version with more flash, more RAM
and faster CPU. Number of partitions is the same but
rootfs partition is different.

Signed-off-by: Samuel Egli <samuel.egli@siemens.com>
Acked-by: Heiko Schocher <hs@denx.de>
Reviewed-by: Tom Rini <trini@konsulko.com>

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index ac86518eb02d6ae33614956631da8474a3b66cc3..13f579a02d0eef78e59dc0aae9e0f5792820b5cd 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -351,6 +351,11 @@ config TARGET_DXR2
        select CPU_V7
        select SUPPORT_SPL
 
+config TARGET_RASTABAN
+       bool "Support rastaban"
+       select CPU_V7
+       select SUPPORT_SPL
+
 config TARGET_PXM2
        bool "Support pxm2"
        select CPU_V7

diff --git a/board/siemens/draco/Kconfig b/board/siemens/draco/Kconfig
index d138ecea9d436179a76bca5c66e17caa6be16d9c..67fa320c872b4cd523e2515283fad53244e63bec 100644 (file)
--- a/board/siemens/draco/Kconfig
+++ b/board/siemens/draco/Kconfig
@@ -29,3 +29,19 @@ config SYS_CONFIG_NAME
        default "dxr2"
 
 endif
+
+if TARGET_RASTABAN
+
+config SYS_BOARD
+       default "draco"
+
+config SYS_VENDOR
+       default "siemens"
+
+config SYS_SOC
+       default "am33xx"
+
+config SYS_CONFIG_NAME
+       default "rastaban"
+
+endif

diff --git a/board/siemens/draco/MAINTAINERS b/board/siemens/draco/MAINTAINERS
index f6b68ca400fe4a50b4ff5714c4847cf16a092666..6d9544af17d09a49f94f8541b27d9152b2b11bc0 100644 (file)
--- a/board/siemens/draco/MAINTAINERS
+++ b/board/siemens/draco/MAINTAINERS
@@ -6,3 +6,5 @@ F:      include/configs/draco.h
 F:     configs/draco_defconfig
 F:     include/configs/dxr2.h
 F:     configs/dxr2_defconfig
+F:     include/configs/rastaban.h
+F:     configs/rastaban_defconfig

diff --git a/configs/rastaban_defconfig b/configs/rastaban_defconfig
new file mode 100644 (file)
index 0000000..954f38a
--- /dev/null
+++ b/configs/rastaban_defconfig
@@ -0,0 +1,7 @@
+CONFIG_ARM=y
+CONFIG_TARGET_RASTABAN=y
+CONFIG_CMD_NET=y
+CONFIG_SPL=y
+CONFIG_AUTOBOOT_KEYED=y
+CONFIG_AUTOBOOT_PROMPT="Autobooting in %d seconds, press \"<Esc><Esc>\" to stop\n"
+CONFIG_AUTOBOOT_STOP_STR="\x1b\x1b"

diff --git a/include/configs/rastaban.h b/include/configs/rastaban.h
new file mode 100644 (file)
index 0000000..d9dde9c
--- /dev/null
+++ b/include/configs/rastaban.h
@@ -0,0 +1,114 @@
+/*
+ * (C) Copyright 2013 Siemens Schweiz AG
+ * (C) Heiko Schocher, DENX Software Engineering, hs@denx.de.
+ *
+ * Based on:
+ * 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_RASTABAN_H
+#define __CONFIG_RASTABAN_H
+
+#include "siemens-am33x-common.h"
+
+#define CONFIG_DISPLAY_CPUINFO
+#define CONFIG_SYS_MPUCLK      300
+#define DDR_PLL_FREQ   303
+#undef CONFIG_SPL_AM33XX_ENABLE_RTC32K_OSC
+
+/* FWD Button = 27
+ * SRV Button = 87 */
+#define BOARD_DFU_BUTTON_GPIO  27
+#define GPIO_LAN9303_NRST      88      /* GPIO2_24 = gpio88 */
+/* In dfu mode keep led1 on */
+#define CONFIG_ENV_SETTINGS_BUTTONS_AND_LEDS \
+       "button_dfu0=27\0" \
+       "button_dfu1=87\0" \
+       "led0=3,0,1\0" \
+       "led1=4,0,0\0" \
+       "led2=5,0,1\0" \
+       "led3=62,0,1\0" \
+       "led4=60,0,1\0" \
+       "led5=63,0,1\0"
+
+#undef CONFIG_DOS_PARTITION
+#undef CONFIG_CMD_FAT
+
+#define CONFIG_BOARD_LATE_INIT
+
+ /* Physical Memory Map */
+#define CONFIG_MAX_RAM_BANK_SIZE       (1024 << 20)    /* 1GB */
+
+/* I2C Configuration */
+#define CONFIG_SYS_I2C_SPEED           100000
+
+#define CONFIG_SYS_I2C_EEPROM_ADDR              0x50
+#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)
+
+
+
+#define MTDPARTS_DEFAULT       MTDPARTS_DEFAULT_V3
+
+#ifndef CONFIG_SPL_BUILD
+
+/* Default env settings */
+#define CONFIG_EXTRA_ENV_SETTINGS \
+       "hostname=rastaban\0" \
+       "nand_img_size=0x400000\0" \
+       "optargs=\0" \
+       "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 " \
+       "run dfu_start; " \
+       "reset; " \
+"fi;" \
+"run nand_boot;" \
+"run nand_boot_backup;" \
+"reset;"
+
+
+#else
+#define CONFIG_BOOTDELAY               0
+
+#define CONFIG_BOOTCOMMAND                     \
+       "setenv autoload no; "                  \
+       "dhcp; "                                \
+       "if tftp 80000000 debrick.scr; then "   \
+               "source 80000000; "             \
+       "fi"
+#endif
+#endif /* CONFIG_SPL_BUILD */
+#endif /* ! __CONFIG_RASTABAN_H */

diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h
index 7b602b3daa145f1bb35c58ec39201406ec74391e..ac4cf688f459b04743ff36984881d3e5b4f594e2 100644 (file)
--- a/include/configs/siemens-am33x-common.h
+++ b/include/configs/siemens-am33x-common.h
@@ -31,7 +31,9 @@
 #define CONFIG_SYS_PROMPT_HUSH_PS2     "> "
 #define CONFIG_BOARD_LATE_INIT
 #define CONFIG_SYS_NO_FLASH
+#ifdef CONFIG_SIEMENS_MACH_TYPE
 #define CONFIG_MACH_TYPE               CONFIG_SIEMENS_MACH_TYPE
+#endif
 
 #define CONFIG_CMDLINE_TAG             /* enable passing of ATAGs */
 #define CONFIG_SETUP_MEMORY_TAGS
@@ -572,6 +574,36 @@
                "tftpboot ${loadaddr} ${serverip}:${bootdtb}; " \
                "bootm ${kloadaddr} - ${loadaddr}\0"
 
+/*
+ * Variant 3 partition layout
+ * chip-size = 512MiB
+ *|         name |        size |           address area |
+ *-------------------------------------------------------
+ *|          spl | 128.000 KiB | 0x       0..0x   1ffff |
+ *|  spl.backup1 | 128.000 KiB | 0x   20000..0x   3ffff |
+ *|  spl.backup2 | 128.000 KiB | 0x   40000..0x   5ffff |
+ *|  spl.backup3 | 128.000 KiB | 0x   60000..0x   7ffff |
+ *|       u-boot |   1.875 MiB | 0x   80000..0x  25ffff |
+ *|   uboot.env0 | 512.000 KiB | 0x  260000..0x  2Dffff |
+ *|   uboot.env1 | 512.000 KiB | 0x  2E0000..0x  35ffff |
+ *|       rootfs | 300.000 MiB | 0x  360000..0x12f5ffff |
+ *|      mtdoops | 512.000 KiB | 0x12f60000..0x12fdffff |
+ *|configuration | 104.125 MiB | 0x12fe0000..0x1fffffff |
+ *-------------------------------------------------------
+ */
+
+#define MTDPARTS_DEFAULT_V3    "mtdparts=" MTDIDS_NAME_STR ":" \
+                                       "128k(spl),"            \
+                                       "128k(spl.backup1),"    \
+                                       "128k(spl.backup2),"    \
+                                       "128k(spl.backup3),"    \
+                                       "1920k(u-boot),"        \
+                                       "512k(u-boot.env0),"    \
+                                       "512k(u-boot.env1),"    \
+                                       "300m(rootfs),"         \
+                                       "512k(mtdoops),"        \
+                                       "-(configuration)"
+
 
 #define CONFIG_NAND_OMAP_GPMC
 #define CONFIG_NAND_OMAP_ELM