Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit a6bc0195dba895fa0e9facc718d17eb098695685

Authored by Albert ARIBAUD
2 parents b653516769 b86d54b2c3
Exists in v2017.01-smarct4x and in 37 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, imx_v2015.04_4.1.15_1.0.0_ga, 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_v2015.04_4.1.15_1.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-m6.0.1_2.1.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

Merge branch 'u-boot-sunxi/master' into 'u-boot-arm/master'

Showing 28 changed files Side-by-side Diff

... ... @@ -36,8 +36,8 @@
36 36 string
37 37 default "sunxi"
38 38  
39   -config FTDFILE
40   - string "Default ftdfile env setting for this board"
  39 +config FDTFILE
  40 + string "Default fdtfile env setting for this board"
41 41  
42 42 endif
board/sunxi/MAINTAINERS
Diff comments   View file @ a6bc019
... ... @@ -32,4 +32,10 @@
32 32 F: configs/Cubieboard2_FEL_defconfig
33 33 F: configs/Cubietruck_defconfig
34 34 F: configs/Cubietruck_FEL_defconfig
  35 +
  36 +A20-OLINUXINO-LIME BOARD
  37 +M: FUKAUMI Naoki <naobsd@gmail.com>
  38 +S: Maintained
  39 +F: board/sunxi/dram_a20_olinuxino_l.c
  40 +F: configs/A20-OLinuXino-Lime_defconfig
board/sunxi/Makefile
Diff comments   View file @ a6bc019
... ... @@ -15,6 +15,7 @@
15 15 obj-$(CONFIG_A10S_OLINUXINO_M) += dram_a10s_olinuxino_m.o
16 16 obj-$(CONFIG_A13_OLINUXINO) += dram_a13_olinuxino.o
17 17 obj-$(CONFIG_A13_OLINUXINOM) += dram_a13_oli_micro.o
  18 +obj-$(CONFIG_A20_OLINUXINO_L) += dram_a20_olinuxino_l.o
18 19 obj-$(CONFIG_A20_OLINUXINO_M) += dram_sun7i_384_1024_iow16.o
19 20 # This is not a typo, uses the same mem settings as the a10s-olinuxino-m
20 21 obj-$(CONFIG_AUXTEK_T004) += dram_a10s_olinuxino_m.o
board/sunxi/dram_a20_olinuxino_l.c
Diff comments   View file @ a6bc019
  1 +/* this file is generated, don't edit it yourself */
  2 +
  3 +#include "common.h"
  4 +#include <asm/arch/dram.h>
  5 +
  6 +static struct dram_para dram_para = {
  7 + .clock = 480,
  8 + .type = 3,
  9 + .rank_num = 1,
  10 + .density = 4096,
  11 + .io_width = 16,
  12 + .bus_width = 16,
  13 + .cas = 9,
  14 + .zq = 0x7f,
  15 + .odt_en = 0,
  16 + .size = 512,
  17 + .tpr0 = 0x42d899b7,
  18 + .tpr1 = 0xa090,
  19 + .tpr2 = 0x22a00,
  20 + .tpr3 = 0,
  21 + .tpr4 = 0,
  22 + .tpr5 = 0,
  23 + .emr1 = 0x4,
  24 + .emr2 = 0x10,
  25 + .emr3 = 0,
  26 +};
  27 +
  28 +unsigned long sunxi_dram_init(void)
  29 +{
  30 + return dramc_init(&dram_para);
  31 +}
configs/A10-OLinuXino-Lime_defconfig
Diff comments   View file @ a6bc019
1 1 CONFIG_SPL=y
2   -CONFIG_SYS_EXTRA_OPTIONS="A10_OLINUXINO_L,SPL,AXP209_POWER,SUNXI_EMAC,AHCI,SATAPWR=SUNXI_GPC(3),USB_EHCI"
3   -CONFIG_FTDFILE="sun4i-a10-olinuxino-lime.dtb"
  2 +CONFIG_SYS_EXTRA_OPTIONS="A10_OLINUXINO_L,AXP209_POWER,SUNXI_EMAC,AHCI,SATAPWR=SUNXI_GPC(3),USB_EHCI"
  3 +CONFIG_FDTFILE="sun4i-a10-olinuxino-lime.dtb"
4 4 +S:CONFIG_ARM=y
5 5 +S:CONFIG_TARGET_SUN4I=y
configs/A10s-OLinuXino-M_defconfig
Diff comments   View file @ a6bc019
1 1 CONFIG_SPL=y
2   -CONFIG_SYS_EXTRA_OPTIONS="A10S_OLINUXINO_M,SPL,AXP152_POWER,SUNXI_EMAC,USB_EHCI,SUNXI_USB_VBUS0_GPIO=SUNXI_GPB(10)"
3   -CONFIG_FTDFILE="sun5i-a10s-olinuxino-micro.dtb"
  2 +CONFIG_SYS_EXTRA_OPTIONS="A10S_OLINUXINO_M,AXP152_POWER,SUNXI_EMAC,USB_EHCI,SUNXI_USB_VBUS0_GPIO=SUNXI_GPB(10)"
  3 +CONFIG_FDTFILE="sun5i-a10s-olinuxino-micro.dtb"
4 4 +S:CONFIG_ARM=y
5 5 +S:CONFIG_TARGET_SUN5I=y
configs/A13-OLinuXinoM_defconfig
Diff comments   View file @ a6bc019
1 1 CONFIG_SPL=y
2   -CONFIG_SYS_EXTRA_OPTIONS="A13_OLINUXINOM,SPL,CONS_INDEX=2,USB_EHCI,SUNXI_USB_VBUS0_GPIO=SUNXI_GPG(11)"
3   -CONFIG_FTDFILE="sun5i-a13-olinuxino-micro.dtb"
  2 +CONFIG_SYS_EXTRA_OPTIONS="A13_OLINUXINOM,CONS_INDEX=2,USB_EHCI,SUNXI_USB_VBUS0_GPIO=SUNXI_GPG(11)"
  3 +CONFIG_FDTFILE="sun5i-a13-olinuxino-micro.dtb"
4 4 +S:CONFIG_ARM=y
5 5 +S:CONFIG_TARGET_SUN5I=y
configs/A13-OLinuXino_defconfig
Diff comments   View file @ a6bc019
1 1 CONFIG_SPL=y
2   -CONFIG_SYS_EXTRA_OPTIONS="A13_OLINUXINO,SPL,CONS_INDEX=2,AXP209_POWER,USB_EHCI,SUNXI_USB_VBUS0_GPIO=SUNXI_GPG(11)"
3   -CONFIG_FTDFILE="sun5i-a13-olinuxino.dtb"
  2 +CONFIG_SYS_EXTRA_OPTIONS="A13_OLINUXINO,CONS_INDEX=2,AXP209_POWER,USB_EHCI,SUNXI_USB_VBUS0_GPIO=SUNXI_GPG(11)"
  3 +CONFIG_FDTFILE="sun5i-a13-olinuxino.dtb"
4 4 +S:CONFIG_ARM=y
5 5 +S:CONFIG_TARGET_SUN5I=y
configs/A20-OLinuXino-Lime_defconfig
Diff comments   View file @ a6bc019
  1 +CONFIG_SPL=y
  2 +CONFIG_SYS_EXTRA_OPTIONS="A20_OLINUXINO_L,AXP209_POWER,SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPC(3),USB_EHCI"
  3 +CONFIG_FDTFILE="sun7i-a20-olinuxino-lime.dtb"
  4 ++S:CONFIG_ARM=y
  5 ++S:CONFIG_TARGET_SUN7I=y
configs/A20-OLinuXino_MICRO_defconfig
Diff comments   View file @ a6bc019
1 1 CONFIG_SPL=y
2   -CONFIG_SYS_EXTRA_OPTIONS="A20_OLINUXINO_M,SPL,AXP209_POWER,SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPB(8),USB_EHCI"
3   -CONFIG_FTDFILE="sun7i-a20-olinuxino-micro.dtb"
  2 +CONFIG_SYS_EXTRA_OPTIONS="A20_OLINUXINO_M,AXP209_POWER,SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPB(8),USB_EHCI"
  3 +CONFIG_FDTFILE="sun7i-a20-olinuxino-micro.dtb"
4 4 +S:CONFIG_ARM=y
5 5 +S:CONFIG_TARGET_SUN7I=y
configs/Auxtek-T004_defconfig
Diff comments   View file @ a6bc019
1 1 CONFIG_SPL=y
2   -CONFIG_SYS_EXTRA_OPTIONS="AUXTEK_T004,SPL,AXP152_POWER,USB_EHCI,SUNXI_USB_VBUS0_GPIO=SUNXI_GPG(13)"
3   -CONFIG_FTDFILE="sun5i-a10s-auxtek-t004.dtb"
  2 +CONFIG_SYS_EXTRA_OPTIONS="AUXTEK_T004,AXP152_POWER,USB_EHCI,SUNXI_USB_VBUS0_GPIO=SUNXI_GPG(13)"
  3 +CONFIG_FDTFILE="sun5i-a10s-auxtek-t004.dtb"
4 4 +S:CONFIG_ARM=y
5 5 +S:CONFIG_TARGET_SUN5I=y
configs/Bananapi_defconfig
Diff comments   View file @ a6bc019
1 1 CONFIG_SPL=y
2   -CONFIG_SYS_EXTRA_OPTIONS="BANANAPI,SPL,AXP209_POWER,SUNXI_GMAC,RGMII,MACPWR=SUNXI_GPH(23),AHCI,USB_EHCI"
3   -CONFIG_FTDFILE="sun7i-a20-bananapi.dtb"
  2 +CONFIG_SYS_EXTRA_OPTIONS="BANANAPI,AXP209_POWER,SUNXI_GMAC,RGMII,MACPWR=SUNXI_GPH(23),AHCI,USB_EHCI"
  3 +CONFIG_FDTFILE="sun7i-a20-bananapi.dtb"
4 4 +S:CONFIG_ARM=y
5 5 +S:CONFIG_TARGET_SUN7I=y
configs/Cubieboard2_FEL_defconfig
Diff comments   View file @ a6bc019
1 1 CONFIG_SPL=y
2 2 CONFIG_SYS_EXTRA_OPTIONS="CUBIEBOARD2,SPL_FEL,AXP209_POWER,SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPB(8),USB_EHCI"
3   -CONFIG_FTDFILE="sun7i-a20-cubieboard2.dtb"
  3 +CONFIG_FDTFILE="sun7i-a20-cubieboard2.dtb"
4 4 +S:CONFIG_ARM=y
5 5 +S:CONFIG_TARGET_SUN7I=y
configs/Cubieboard2_defconfig
Diff comments   View file @ a6bc019
1 1 CONFIG_SPL=y
2   -CONFIG_SYS_EXTRA_OPTIONS="CUBIEBOARD2,SPL,AXP209_POWER,SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPB(8),USB_EHCI"
3   -CONFIG_FTDFILE="sun7i-a20-cubieboard2.dtb"
  2 +CONFIG_SYS_EXTRA_OPTIONS="CUBIEBOARD2,AXP209_POWER,SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPB(8),USB_EHCI"
  3 +CONFIG_FDTFILE="sun7i-a20-cubieboard2.dtb"
4 4 +S:CONFIG_ARM=y
5 5 +S:CONFIG_TARGET_SUN7I=y
configs/Cubieboard_defconfig
Diff comments   View file @ a6bc019
1 1 CONFIG_SPL=y
2   -CONFIG_SYS_EXTRA_OPTIONS="CUBIEBOARD,SPL,AXP209_POWER,SUNXI_EMAC,AHCI,SATAPWR=SUNXI_GPB(8),USB_EHCI"
3   -CONFIG_FTDFILE="sun4i-a10-cubieboard.dtb"
  2 +CONFIG_SYS_EXTRA_OPTIONS="CUBIEBOARD,AXP209_POWER,SUNXI_EMAC,AHCI,SATAPWR=SUNXI_GPB(8),USB_EHCI"
  3 +CONFIG_FDTFILE="sun4i-a10-cubieboard.dtb"
4 4 +S:CONFIG_ARM=y
5 5 +S:CONFIG_TARGET_SUN4I=y
configs/Cubietruck_FEL_defconfig
Diff comments   View file @ a6bc019
1 1 CONFIG_SPL=y
2 2 CONFIG_SYS_EXTRA_OPTIONS="CUBIETRUCK,SPL_FEL,AXP209_POWER,SUNXI_GMAC,RGMII,AHCI,SATAPWR=SUNXI_GPH(12),USB_EHCI"
3   -CONFIG_FTDFILE="sun7i-a20-cubietruck.dtb"
  3 +CONFIG_FDTFILE="sun7i-a20-cubietruck.dtb"
4 4 +S:CONFIG_ARM=y
5 5 +S:CONFIG_TARGET_SUN7I=y
configs/Cubietruck_defconfig
Diff comments   View file @ a6bc019
1 1 CONFIG_SPL=y
2   -CONFIG_SYS_EXTRA_OPTIONS="CUBIETRUCK,SPL,AXP209_POWER,SUNXI_GMAC,RGMII,AHCI,SATAPWR=SUNXI_GPH(12),USB_EHCI"
3   -CONFIG_FTDFILE="sun7i-a20-cubietruck.dtb"
  2 +CONFIG_SYS_EXTRA_OPTIONS="CUBIETRUCK,AXP209_POWER,SUNXI_GMAC,RGMII,AHCI,SATAPWR=SUNXI_GPH(12),USB_EHCI"
  3 +CONFIG_FDTFILE="sun7i-a20-cubietruck.dtb"
4 4 +S:CONFIG_ARM=y
5 5 +S:CONFIG_TARGET_SUN7I=y
configs/Linksprite_pcDuino3_defconfig
Diff comments   View file @ a6bc019
1 1 CONFIG_SPL=y
2   -CONFIG_SYS_EXTRA_OPTIONS="PCDUINO3,SPL,AXP209_POWER,SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPH(2),USB_EHCI"
3   -CONFIG_FTDFILE="sun7i-a20-pcduino3.dtb"
  2 +CONFIG_SYS_EXTRA_OPTIONS="PCDUINO3,AXP209_POWER,SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPH(2),USB_EHCI"
  3 +CONFIG_FDTFILE="sun7i-a20-pcduino3.dtb"
4 4 +S:CONFIG_ARM=y
5 5 +S:CONFIG_TARGET_SUN7I=y
configs/Mele_A1000G_defconfig
Diff comments   View file @ a6bc019
1 1 CONFIG_SPL=y
2   -CONFIG_SYS_EXTRA_OPTIONS="MELE_A1000G,SPL,AXP209_POWER,SUNXI_EMAC,MACPWR=SUNXI_GPH(15),AHCI,USB_EHCI"
3   -CONFIG_FTDFILE="sun4i-a10-a1000.dtb"
  2 +CONFIG_SYS_EXTRA_OPTIONS="MELE_A1000G,AXP209_POWER,SUNXI_EMAC,MACPWR=SUNXI_GPH(15),AHCI,USB_EHCI"
  3 +CONFIG_FDTFILE="sun4i-a10-a1000.dtb"
4 4 +S:CONFIG_ARM=y
5 5 +S:CONFIG_TARGET_SUN4I=y
configs/Mele_A1000_defconfig
Diff comments   View file @ a6bc019
1 1 CONFIG_SPL=y
2   -CONFIG_SYS_EXTRA_OPTIONS="MELE_A1000,SPL,AXP209_POWER,SUNXI_EMAC,MACPWR=SUNXI_GPH(15),AHCI,USB_EHCI"
3   -CONFIG_FTDFILE="sun4i-a10-a1000.dtb"
  2 +CONFIG_SYS_EXTRA_OPTIONS="MELE_A1000,AXP209_POWER,SUNXI_EMAC,MACPWR=SUNXI_GPH(15),AHCI,USB_EHCI"
  3 +CONFIG_FDTFILE="sun4i-a10-a1000.dtb"
4 4 +S:CONFIG_ARM=y
5 5 +S:CONFIG_TARGET_SUN4I=y
configs/Mini-X-1Gb_defconfig
Diff comments   View file @ a6bc019
1 1 CONFIG_SPL=y
2   -CONFIG_SYS_EXTRA_OPTIONS="MINI_X_1GB,SPL,AXP209_POWER,USB_EHCI"
3   -CONFIG_FTDFILE="sun4i-a10-mini-xplus.dtb"
  2 +CONFIG_SYS_EXTRA_OPTIONS="MINI_X_1GB,AXP209_POWER,USB_EHCI"
  3 +CONFIG_FDTFILE="sun4i-a10-mini-xplus.dtb"
4 4 +S:CONFIG_ARM=y
5 5 +S:CONFIG_TARGET_SUN4I=y
configs/Mini-X_defconfig
Diff comments   View file @ a6bc019
1 1 CONFIG_SPL=y
2   -CONFIG_SYS_EXTRA_OPTIONS="MINI_X,SPL,AXP209_POWER,USB_EHCI"
3   -CONFIG_FTDFILE="sun4i-a10-mini-xplus.dtb"
  2 +CONFIG_SYS_EXTRA_OPTIONS="MINI_X,AXP209_POWER,USB_EHCI"
  3 +CONFIG_FDTFILE="sun4i-a10-mini-xplus.dtb"
4 4 +S:CONFIG_ARM=y
5 5 +S:CONFIG_TARGET_SUN4I=y
configs/ba10_tv_box_defconfig
Diff comments   View file @ a6bc019
1 1 CONFIG_SPL=y
2   -CONFIG_SYS_EXTRA_OPTIONS="BA10_TV_BOX,SPL,AXP209_POWER,SUNXI_EMAC,USB_EHCI,SUNXI_USB_VBUS1_GPIO=SUNXI_GPH(12)"
3   -CONFIG_FTDFILE="sun4i-a10-ba10-tvbox.dtb"
  2 +CONFIG_SYS_EXTRA_OPTIONS="BA10_TV_BOX,AXP209_POWER,SUNXI_EMAC,USB_EHCI,SUNXI_USB_VBUS1_GPIO=SUNXI_GPH(12)"
  3 +CONFIG_FDTFILE="sun4i-a10-ba10-tvbox.dtb"
4 4 +S:CONFIG_ARM=y
5 5 +S:CONFIG_TARGET_SUN4I=y
configs/gwventana_defconfig
Diff comments   View file @ a6bc019
1 1 CONFIG_SPL=y
2   -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/gateworks/gw_ventana/gw_ventana.cfg,MX6QDL,SPL"
  2 +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/gateworks/gw_ventana/gw_ventana.cfg,MX6QDL"
3 3 +S:CONFIG_ARM=y
4 4 +S:CONFIG_TARGET_GW_VENTANA=y
configs/i12-tvbox_defconfig
Diff comments   View file @ a6bc019
1 1 CONFIG_SPL=y
2   -CONFIG_SYS_EXTRA_OPTIONS="I12_TVBOX,SPL,AXP209_POWER,SUNXI_GMAC,MACPWR=SUNXI_GPH(21),USB_EHCI"
3   -CONFIG_FTDFILE="sun7i-a20-i12-tvbox.dtb"
  2 +CONFIG_SYS_EXTRA_OPTIONS="I12_TVBOX,AXP209_POWER,SUNXI_GMAC,MACPWR=SUNXI_GPH(21),USB_EHCI"
  3 +CONFIG_FDTFILE="sun7i-a20-i12-tvbox.dtb"
4 4 +S:CONFIG_ARM=y
5 5 +S:CONFIG_TARGET_SUN7I=y
configs/qt840a_defconfig
Diff comments   View file @ a6bc019
1 1 CONFIG_SPL=y
2   -CONFIG_SYS_EXTRA_OPTIONS="QT840A,SPL,AXP209_POWER,SUNXI_GMAC,MACPWR=SUNXI_GPH(21),USB_EHCI"
3   -CONFIG_FTDFILE="sun7i-a20-i12-tvbox.dtb"
  2 +CONFIG_SYS_EXTRA_OPTIONS="QT840A,AXP209_POWER,SUNXI_GMAC,MACPWR=SUNXI_GPH(21),USB_EHCI"
  3 +CONFIG_FDTFILE="sun7i-a20-i12-tvbox.dtb"
4 4 +S:CONFIG_ARM=y
5 5 +S:CONFIG_TARGET_SUN7I=y
configs/r7-tv-dongle_defconfig
Diff comments   View file @ a6bc019
1 1 CONFIG_SPL=y
2   -CONFIG_SYS_EXTRA_OPTIONS="R7DONGLE,SPL,AXP152_POWER,USB_EHCI,SUNXI_USB_VBUS0_GPIO=SUNXI_GPG(13)"
3   -CONFIG_FTDFILE="sun5i-a10s-r7-tv-dongle.dtb"
  2 +CONFIG_SYS_EXTRA_OPTIONS="R7DONGLE,AXP152_POWER,USB_EHCI,SUNXI_USB_VBUS0_GPIO=SUNXI_GPG(13)"
  3 +CONFIG_FDTFILE="sun5i-a10s-r7-tv-dongle.dtb"
4 4 +S:CONFIG_ARM=y
5 5 +S:CONFIG_TARGET_SUN5I=y
include/configs/sunxi-common.h
Diff comments   View file @ a6bc019
... ... @@ -244,7 +244,7 @@
244 244  
245 245 #define CONFIG_EXTRA_ENV_SETTINGS \
246 246 MEM_LAYOUT_ENV_SETTINGS \
247   - "fdtfile=" CONFIG_FTDFILE "FILE "\0" \" \
  247 + "fdtfile=" CONFIG_FDTFILE "FILE "\0" \" \
248 248 "console=ttyS0,115200\0" \
249 249 BOOTENV
250 250