Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 578056c35d20d2f6e2f6618d9f86628f588932c4

Authored by Heiko Schocher
Committed by Tom Rini
1 parent 3b10cf120b
Exists in v2017.01-smarct4x and in 34 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2017.03_4.9.11_1.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.88_2.0.0_ga, smarc-imx_v2017.03_o8.1.0_1.3.0_8m, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_2.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0, smarc_8mq_lf_v2020.04, ti-u-boot-2015.07, v2015.07-smarct33, v2015.07-smarct33-emmc, v2015.07-smarct4x, v2016.05-dlt, v2016.05-smarct3x, v2016.05-smarct3x-emmc, v2016.05-smarct4x, v2017.01-smarct3x, v2017.01-smarct3x-emmc

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>

Showing 6 changed files with 176 additions and 0 deletions Side-by-side Diff

... ... @@ -351,6 +351,11 @@
351 351 select CPU_V7
352 352 select SUPPORT_SPL
353 353  
  354 +config TARGET_RASTABAN
  355 + bool "Support rastaban"
  356 + select CPU_V7
  357 + select SUPPORT_SPL
  358 +
354 359 config TARGET_PXM2
355 360 bool "Support pxm2"
356 361 select CPU_V7
board/siemens/draco/Kconfig
Diff comments   View file @ 578056c
... ... @@ -29,4 +29,20 @@
29 29 default "dxr2"
30 30  
31 31 endif
  32 +
  33 +if TARGET_RASTABAN
  34 +
  35 +config SYS_BOARD
  36 + default "draco"
  37 +
  38 +config SYS_VENDOR
  39 + default "siemens"
  40 +
  41 +config SYS_SOC
  42 + default "am33xx"
  43 +
  44 +config SYS_CONFIG_NAME
  45 + default "rastaban"
  46 +
  47 +endif
board/siemens/draco/MAINTAINERS
Diff comments   View file @ 578056c
... ... @@ -6,4 +6,6 @@
6 6 F: configs/draco_defconfig
7 7 F: include/configs/dxr2.h
8 8 F: configs/dxr2_defconfig
  9 +F: include/configs/rastaban.h
  10 +F: configs/rastaban_defconfig
configs/rastaban_defconfig
Diff comments   View file @ 578056c
  1 +CONFIG_ARM=y
  2 +CONFIG_TARGET_RASTABAN=y
  3 +CONFIG_CMD_NET=y
  4 +CONFIG_SPL=y
  5 +CONFIG_AUTOBOOT_KEYED=y
  6 +CONFIG_AUTOBOOT_PROMPT="Autobooting in %d seconds, press \"<Esc><Esc>\" to stop\n"
  7 +CONFIG_AUTOBOOT_STOP_STR="\x1b\x1b"
include/configs/rastaban.h
Diff comments   View file @ 578056c
  1 +/*
  2 + * (C) Copyright 2013 Siemens Schweiz AG
  3 + * (C) Heiko Schocher, DENX Software Engineering, hs@denx.de.
  4 + *
  5 + * Based on:
  6 + * U-Boot file:/include/configs/am335x_evm.h
  7 + *
  8 + * Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/
  9 + *
  10 + * SPDX-License-Identifier: GPL-2.0+
  11 + */
  12 +
  13 +#ifndef __CONFIG_RASTABAN_H
  14 +#define __CONFIG_RASTABAN_H
  15 +
  16 +#include "siemens-am33x-common.h"
  17 +
  18 +#define CONFIG_DISPLAY_CPUINFO
  19 +#define CONFIG_SYS_MPUCLK 300
  20 +#define DDR_PLL_FREQ 303
  21 +#undef CONFIG_SPL_AM33XX_ENABLE_RTC32K_OSC
  22 +
  23 +/* FWD Button = 27
  24 + * SRV Button = 87 */
  25 +#define BOARD_DFU_BUTTON_GPIO 27
  26 +#define GPIO_LAN9303_NRST 88 /* GPIO2_24 = gpio88 */
  27 +/* In dfu mode keep led1 on */
  28 +#define CONFIG_ENV_SETTINGS_BUTTONS_AND_LEDS \
  29 + "button_dfu0=27\0" \
  30 + "button_dfu1=87\0" \
  31 + "led0=3,0,1\0" \
  32 + "led1=4,0,0\0" \
  33 + "led2=5,0,1\0" \
  34 + "led3=62,0,1\0" \
  35 + "led4=60,0,1\0" \
  36 + "led5=63,0,1\0"
  37 +
  38 +#undef CONFIG_DOS_PARTITION
  39 +#undef CONFIG_CMD_FAT
  40 +
  41 +#define CONFIG_BOARD_LATE_INIT
  42 +
  43 + /* Physical Memory Map */
  44 +#define CONFIG_MAX_RAM_BANK_SIZE (1024 << 20) /* 1GB */
  45 +
  46 +/* I2C Configuration */
  47 +#define CONFIG_SYS_I2C_SPEED 100000
  48 +
  49 +#define CONFIG_SYS_I2C_EEPROM_ADDR 0x50
  50 +#define EEPROM_ADDR_DDR3 0x90
  51 +#define EEPROM_ADDR_CHIP 0x120
  52 +
  53 +#define CONFIG_SYS_U_BOOT_MAX_SIZE_SECTORS 0x300
  54 +
  55 +#undef CONFIG_SPL_NET_SUPPORT
  56 +#undef CONFIG_SPL_NET_VCI_STRING
  57 +#undef CONFIG_SPL_ETH_SUPPORT
  58 +
  59 +#undef CONFIG_MII
  60 +#undef CONFIG_PHY_GIGE
  61 +#define CONFIG_PHY_SMSC
  62 +
  63 +#define CONFIG_FACTORYSET
  64 +
  65 +/* Watchdog */
  66 +#define CONFIG_OMAP_WATCHDOG
  67 +
  68 +/* Define own nand partitions */
  69 +#define CONFIG_ENV_OFFSET_REDUND 0x2E0000
  70 +#define CONFIG_ENV_SIZE_REDUND 0x2000
  71 +#define CONFIG_ENV_RANGE (4 * CONFIG_SYS_ENV_SECT_SIZE)
  72 +
  73 +
  74 +
  75 +#define MTDPARTS_DEFAULT MTDPARTS_DEFAULT_V3
  76 +
  77 +#ifndef CONFIG_SPL_BUILD
  78 +
  79 +/* Default env settings */
  80 +#define CONFIG_EXTRA_ENV_SETTINGS \
  81 + "hostname=rastaban\0" \
  82 + "nand_img_size=0x400000\0" \
  83 + "optargs=\0" \
  84 + "preboot=draco_led 0\0" \
  85 + CONFIG_ENV_SETTINGS_BUTTONS_AND_LEDS \
  86 + CONFIG_ENV_SETTINGS_V2 \
  87 + CONFIG_ENV_SETTINGS_NAND_V2
  88 +
  89 +#ifndef CONFIG_RESTORE_FLASH
  90 +/* set to negative value for no autoboot */
  91 +#define CONFIG_BOOTDELAY 3
  92 +
  93 +#define CONFIG_BOOTCOMMAND \
  94 +"if dfubutton; then " \
  95 + "run dfu_start; " \
  96 + "reset; " \
  97 +"fi;" \
  98 +"run nand_boot;" \
  99 +"run nand_boot_backup;" \
  100 +"reset;"
  101 +
  102 +
  103 +#else
  104 +#define CONFIG_BOOTDELAY 0
  105 +
  106 +#define CONFIG_BOOTCOMMAND \
  107 + "setenv autoload no; " \
  108 + "dhcp; " \
  109 + "if tftp 80000000 debrick.scr; then " \
  110 + "source 80000000; " \
  111 + "fi"
  112 +#endif
  113 +#endif /* CONFIG_SPL_BUILD */
  114 +#endif /* ! __CONFIG_RASTABAN_H */
include/configs/siemens-am33x-common.h
Diff comments   View file @ 578056c
... ... @@ -31,7 +31,9 @@
31 31 #define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
32 32 #define CONFIG_BOARD_LATE_INIT
33 33 #define CONFIG_SYS_NO_FLASH
  34 +#ifdef CONFIG_SIEMENS_MACH_TYPE
34 35 #define CONFIG_MACH_TYPE CONFIG_SIEMENS_MACH_TYPE
  36 +#endif
35 37  
36 38 #define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */
37 39 #define CONFIG_SETUP_MEMORY_TAGS
... ... @@ -571,6 +573,36 @@
571 573 "tftpboot ${kloadaddr} ${serverip}:${bootfile}; " \
572 574 "tftpboot ${loadaddr} ${serverip}:${bootdtb}; " \
573 575 "bootm ${kloadaddr} - ${loadaddr}\0"
  576 +
  577 +/*
  578 + * Variant 3 partition layout
  579 + * chip-size = 512MiB
  580 + *| name | size | address area |
  581 + *-------------------------------------------------------
  582 + *| spl | 128.000 KiB | 0x 0..0x 1ffff |
  583 + *| spl.backup1 | 128.000 KiB | 0x 20000..0x 3ffff |
  584 + *| spl.backup2 | 128.000 KiB | 0x 40000..0x 5ffff |
  585 + *| spl.backup3 | 128.000 KiB | 0x 60000..0x 7ffff |
  586 + *| u-boot | 1.875 MiB | 0x 80000..0x 25ffff |
  587 + *| uboot.env0 | 512.000 KiB | 0x 260000..0x 2Dffff |
  588 + *| uboot.env1 | 512.000 KiB | 0x 2E0000..0x 35ffff |
  589 + *| rootfs | 300.000 MiB | 0x 360000..0x12f5ffff |
  590 + *| mtdoops | 512.000 KiB | 0x12f60000..0x12fdffff |
  591 + *|configuration | 104.125 MiB | 0x12fe0000..0x1fffffff |
  592 + *-------------------------------------------------------
  593 + */
  594 +
  595 +#define MTDPARTS_DEFAULT_V3 "mtdparts=" MTDIDS_NAME_STR ":" \
  596 + "128k(spl)," \
  597 + "128k(spl.backup1)," \
  598 + "128k(spl.backup2)," \
  599 + "128k(spl.backup3)," \
  600 + "1920k(u-boot)," \
  601 + "512k(u-boot.env0)," \
  602 + "512k(u-boot.env1)," \
  603 + "300m(rootfs)," \
  604 + "512k(mtdoops)," \
  605 + "-(configuration)"
574 606  
575 607  
576 608 #define CONFIG_NAND_OMAP_GPMC