Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 8c65a2fae89ec10f30acdf5bbf42f799f86c3f3d

Authored by Heiko Schocher
Committed by Tom Rini
1 parent 578056c35d
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,thuban: rename dxr2 to thuban 

Update new naming scheme.

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

Showing 7 changed files with 119 additions and 125 deletions Side-by-side Diff

... ... @@ -346,8 +346,8 @@
346 346 select CPU_V7
347 347 select SUPPORT_SPL
348 348  
349   -config TARGET_DXR2
350   - bool "Support dxr2"
  349 +config TARGET_THUBAN
  350 + bool "Support thuban"
351 351 select CPU_V7
352 352 select SUPPORT_SPL
353 353  
board/siemens/draco/Kconfig
Diff comments   View file @ 8c65a2f
... ... @@ -14,7 +14,7 @@
14 14  
15 15 endif
16 16  
17   -if TARGET_DXR2
  17 +if TARGET_THUBAN
18 18  
19 19 config SYS_BOARD
20 20 default "draco"
... ... @@ -26,7 +26,7 @@
26 26 default "am33xx"
27 27  
28 28 config SYS_CONFIG_NAME
29   - default "dxr2"
  29 + default "thuban"
30 30  
31 31 endif
32 32  
board/siemens/draco/MAINTAINERS
Diff comments   View file @ 8c65a2f
... ... @@ -4,8 +4,8 @@
4 4 F: board/siemens/draco/
5 5 F: include/configs/draco.h
6 6 F: configs/draco_defconfig
7   -F: include/configs/dxr2.h
8   -F: configs/dxr2_defconfig
  7 +F: include/configs/thuban.h
  8 +F: configs/thuban_defconfig
9 9 F: include/configs/rastaban.h
10 10 F: configs/rastaban_defconfig
configs/dxr2_defconfig
View file @ 8c65a2f
1   -CONFIG_ARM=y
2   -CONFIG_TARGET_DXR2=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"
configs/thuban_defconfig
Diff comments   View file @ 8c65a2f
  1 +CONFIG_ARM=y
  2 +CONFIG_TARGET_THUBAN=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/dxr2.h
View file @ 8c65a2f
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_DXR2_H
14   -#define __CONFIG_DXR2_H
15   -
16   -#define CONFIG_SIEMENS_DXR2
17   -#define MACH_TYPE_DXR2 4315
18   -#define CONFIG_SIEMENS_MACH_TYPE MACH_TYPE_DXR2
19   -
20   -#include "siemens-am33x-common.h"
21   -
22   -#define CONFIG_DISPLAY_CPUINFO
23   -#define CONFIG_SYS_MPUCLK 300
24   -#define DDR_PLL_FREQ 303
25   -#undef CONFIG_SPL_AM33XX_ENABLE_RTC32K_OSC
26   -
27   -#define BOARD_DFU_BUTTON_GPIO 27
28   -#define BOARD_DFU_BUTTON_LED 64 /* red LED */
29   -#define BOARD_STATUS_LED 103 /* green LED */
30   -#define GPIO_LAN9303_NRST 88 /* GPIO2_24 = gpio88 */
31   -
32   -#define CONFIG_ENV_SETTINGS_BUTTONS_AND_LEDS \
33   - "button_dfu0=27\0" \
34   - "led0=103,1,0\0" \
35   - "led1=64,0,1\0"
36   -
37   -#undef CONFIG_DOS_PARTITION
38   -#undef CONFIG_CMD_FAT
39   -
40   -#define CONFIG_BOARD_LATE_INIT
41   -
42   - /* Physical Memory Map */
43   -#define CONFIG_MAX_RAM_BANK_SIZE (1024 << 20) /* 1GB */
44   -
45   -/* I2C Configuration */
46   -#define CONFIG_SYS_I2C_SPEED 100000
47   -
48   -#define CONFIG_SYS_I2C_EEPROM_ADDR 0x50
49   -#define EEPROM_ADDR_DDR3 0x90
50   -#define EEPROM_ADDR_CHIP 0x120
51   -
52   -#define CONFIG_SYS_U_BOOT_MAX_SIZE_SECTORS 0x300
53   -
54   -#undef CONFIG_SPL_NET_SUPPORT
55   -#undef CONFIG_SPL_NET_VCI_STRING
56   -#undef CONFIG_SPL_ETH_SUPPORT
57   -
58   -#undef CONFIG_MII
59   -#undef CONFIG_PHY_GIGE
60   -#define CONFIG_PHY_SMSC
61   -
62   -#define CONFIG_FACTORYSET
63   -
64   -/* Watchdog */
65   -#define CONFIG_OMAP_WATCHDOG
66   -
67   -/* Define own nand partitions */
68   -#define CONFIG_ENV_OFFSET_REDUND 0x2E0000
69   -#define CONFIG_ENV_SIZE_REDUND 0x2000
70   -#define CONFIG_ENV_RANGE (4 * CONFIG_SYS_ENV_SECT_SIZE)
71   -
72   -
73   -#define MTDPARTS_DEFAULT MTDPARTS_DEFAULT_V2
74   -
75   -#ifndef CONFIG_SPL_BUILD
76   -
77   -/* Default env settings */
78   -#define CONFIG_EXTRA_ENV_SETTINGS \
79   - "hostname=dxr2\0" \
80   - "nand_img_size=0x400000\0" \
81   - "optargs=\0" \
82   - "preboot=draco_led 0\0" \
83   - CONFIG_ENV_SETTINGS_BUTTONS_AND_LEDS \
84   - CONFIG_ENV_SETTINGS_V2 \
85   - CONFIG_ENV_SETTINGS_NAND_V2
86   -
87   -#ifndef CONFIG_RESTORE_FLASH
88   -/* set to negative value for no autoboot */
89   -#define CONFIG_BOOTDELAY 3
90   -
91   -#define CONFIG_BOOTCOMMAND \
92   -"if dfubutton; then " \
93   - "run dfu_start; " \
94   - "reset; " \
95   -"fi;" \
96   -"run nand_boot;" \
97   -"run nand_boot_backup;" \
98   -"reset;"
99   -
100   -
101   -#else
102   -#define CONFIG_BOOTDELAY 0
103   -
104   -#define CONFIG_BOOTCOMMAND \
105   - "setenv autoload no; " \
106   - "dhcp; " \
107   - "if tftp 80000000 debrick.scr; then " \
108   - "source 80000000; " \
109   - "fi"
110   -#endif
111   -#endif /* CONFIG_SPL_BUILD */
112   -#endif /* ! __CONFIG_DXR2_H */
include/configs/thuban.h
Diff comments   View file @ 8c65a2f
  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_THUBAN_H
  14 +#define __CONFIG_THUBAN_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 +#define BOARD_DFU_BUTTON_GPIO 27 /* Use as default */
  24 +#define GPIO_LAN9303_NRST 88 /* GPIO2_24 = gpio88 */
  25 +
  26 +#define CONFIG_ENV_SETTINGS_BUTTONS_AND_LEDS \
  27 + "button_dfu0=27\0" \
  28 + "led0=103,1,0\0" \
  29 + "led1=64,0,1\0"
  30 +
  31 +#undef CONFIG_DOS_PARTITION
  32 +#undef CONFIG_CMD_FAT
  33 +
  34 +#define CONFIG_BOARD_LATE_INIT
  35 +
  36 + /* Physical Memory Map */
  37 +#define CONFIG_MAX_RAM_BANK_SIZE (1024 << 20) /* 1GB */
  38 +
  39 +/* I2C Configuration */
  40 +#define CONFIG_SYS_I2C_SPEED 100000
  41 +
  42 +#define CONFIG_SYS_I2C_EEPROM_ADDR 0x50
  43 +#define EEPROM_ADDR_DDR3 0x90
  44 +#define EEPROM_ADDR_CHIP 0x120
  45 +
  46 +#define CONFIG_SYS_U_BOOT_MAX_SIZE_SECTORS 0x300
  47 +
  48 +#undef CONFIG_SPL_NET_SUPPORT
  49 +#undef CONFIG_SPL_NET_VCI_STRING
  50 +#undef CONFIG_SPL_ETH_SUPPORT
  51 +
  52 +#undef CONFIG_MII
  53 +#undef CONFIG_PHY_GIGE
  54 +#define CONFIG_PHY_SMSC
  55 +
  56 +#define CONFIG_FACTORYSET
  57 +
  58 +/* Watchdog */
  59 +#define CONFIG_OMAP_WATCHDOG
  60 +
  61 +/* Define own nand partitions */
  62 +#define CONFIG_ENV_OFFSET_REDUND 0x2E0000
  63 +#define CONFIG_ENV_SIZE_REDUND 0x2000
  64 +#define CONFIG_ENV_RANGE (4 * CONFIG_SYS_ENV_SECT_SIZE)
  65 +
  66 +
  67 +#define MTDPARTS_DEFAULT MTDPARTS_DEFAULT_V2
  68 +
  69 +#ifndef CONFIG_SPL_BUILD
  70 +
  71 +/* Default env settings */
  72 +#define CONFIG_EXTRA_ENV_SETTINGS \
  73 + "hostname=thuban\0" \
  74 + "nand_img_size=0x400000\0" \
  75 + "optargs=\0" \
  76 + "preboot=draco_led 0\0" \
  77 + CONFIG_ENV_SETTINGS_BUTTONS_AND_LEDS \
  78 + CONFIG_ENV_SETTINGS_V2 \
  79 + CONFIG_ENV_SETTINGS_NAND_V2
  80 +
  81 +#ifndef CONFIG_RESTORE_FLASH
  82 +/* set to negative value for no autoboot */
  83 +#define CONFIG_BOOTDELAY 3
  84 +
  85 +#define CONFIG_BOOTCOMMAND \
  86 +"if dfubutton; then " \
  87 + "run dfu_start; " \
  88 + "reset; " \
  89 +"fi;" \
  90 +"run nand_boot;" \
  91 +"run nand_boot_backup;" \
  92 +"reset;"
  93 +
  94 +
  95 +#else
  96 +#define CONFIG_BOOTDELAY 0
  97 +
  98 +#define CONFIG_BOOTCOMMAND \
  99 + "setenv autoload no; " \
  100 + "dhcp; " \
  101 + "if tftp 80000000 debrick.scr; then " \
  102 + "source 80000000; " \
  103 + "fi"
  104 +#endif
  105 +#endif /* CONFIG_SPL_BUILD */
  106 +#endif /* ! __CONFIG_THUBAN_H */