diff --git a/board/sunxi/Kconfig b/board/sunxi/Kconfig index 11e14d638e42ff32a57c12de3c44bb82f775bf23..6c41aead44cfd8c0d09e0b967aec0eb7482ca152 100644 --- a/board/sunxi/Kconfig +++ b/board/sunxi/Kconfig @@ -209,9 +209,6 @@ config UART0_PORT_F at the same time, the system can be only booted in the FEL mode. Only enable this if you really know what you are doing. -config FDTFILE - string "Default fdtfile env setting for this board" - config OLD_SUNXI_KERNEL_COMPAT boolean "Enable workarounds for booting old kernels" default n diff --git a/configs/A10-OLinuXino-Lime_defconfig b/configs/A10-OLinuXino-Lime_defconfig index 3e19424f9c5412cb1d9606bf4ebd0c7947e4cc75..0713652c581979786d5c7d8e435016a7988386fa 100644 --- a/configs/A10-OLinuXino-Lime_defconfig +++ b/configs/A10-OLinuXino-Lime_defconfig @@ -1,6 +1,6 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_EMAC,AHCI,SATAPWR=SUNXI_GPC(3),USB_EHCI" -CONFIG_FDTFILE="sun4i-a10-olinuxino-lime.dtb" +CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-olinuxino-lime" CONFIG_ARM=y CONFIG_ARCH_SUNXI=y CONFIG_MACH_SUN4I=y diff --git a/configs/A10s-OLinuXino-M_defconfig b/configs/A10s-OLinuXino-M_defconfig index 73b78949df16abeeec75294ec4fd172c70570589..e7389238d94a42cd9bb8109a0cbc23d8d6a3d1a4 100644 --- a/configs/A10s-OLinuXino-M_defconfig +++ b/configs/A10s-OLinuXino-M_defconfig @@ -1,6 +1,6 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="AXP152_POWER,SUNXI_EMAC,USB_EHCI" -CONFIG_FDTFILE="sun5i-a10s-olinuxino-micro.dtb" +CONFIG_DEFAULT_DEVICE_TREE="sun5i-a10s-olinuxino-micro" CONFIG_MMC_SUNXI_SLOT_EXTRA=1 CONFIG_USB1_VBUS_PIN="PB10" CONFIG_MMC0_CD_PIN="PG1" diff --git a/configs/A13-OLinuXinoM_defconfig b/configs/A13-OLinuXinoM_defconfig index ab890c6c5eb1730d529d76d2f94d10a6fd839e97..f558a6cf9477d7ff0b79610b4b4df1ae4daaeae6 100644 --- a/configs/A13-OLinuXinoM_defconfig +++ b/configs/A13-OLinuXinoM_defconfig @@ -1,6 +1,6 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=2,USB_EHCI" -CONFIG_FDTFILE="sun5i-a13-olinuxino-micro.dtb" +CONFIG_DEFAULT_DEVICE_TREE="sun5i-a13-olinuxino-micro" CONFIG_USB1_VBUS_PIN="PG11" CONFIG_VIDEO_HDMI=n CONFIG_VIDEO_VGA_VIA_LCD=y diff --git a/configs/A13-OLinuXino_defconfig b/configs/A13-OLinuXino_defconfig index ce94ba66d81d1c707f0ce8d00d1289991d06d68a..7b7b1165b10cdb4ebd1320ebb260a721ba20a2c1 100644 --- a/configs/A13-OLinuXino_defconfig +++ b/configs/A13-OLinuXino_defconfig @@ -1,6 +1,6 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=2,AXP209_POWER,USB_EHCI" -CONFIG_FDTFILE="sun5i-a13-olinuxino.dtb" +CONFIG_DEFAULT_DEVICE_TREE="sun5i-a13-olinuxino" CONFIG_USB1_VBUS_PIN="PG11" CONFIG_VIDEO_HDMI=n CONFIG_VIDEO_VGA_VIA_LCD=y diff --git a/configs/A20-OLinuXino-Lime2_defconfig b/configs/A20-OLinuXino-Lime2_defconfig index f7231c612db3b909bdb06c8aecc39eb97a33e2b8..7c1490e047c7218dd23435c4d3b882205c5af7e1 100644 --- a/configs/A20-OLinuXino-Lime2_defconfig +++ b/configs/A20-OLinuXino-Lime2_defconfig @@ -1,6 +1,6 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,RGMII,AHCI,SATAPWR=SUNXI_GPC(3),USB_EHCI" -CONFIG_FDTFILE="sun7i-a20-olinuxino-lime2.dtb" +CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-olinuxino-lime2" CONFIG_MMC0_CD_PIN="PH1" CONFIG_USB0_VBUS_PIN="PC17" CONFIG_USB0_VBUS_DET="PH5" diff --git a/configs/A20-OLinuXino-Lime_defconfig b/configs/A20-OLinuXino-Lime_defconfig index 7868d6edccad06d17d6fcfc369f81a4b4f2f0d61..879b939f1fc90a674ee77476f402129387bc7e5e 100644 --- a/configs/A20-OLinuXino-Lime_defconfig +++ b/configs/A20-OLinuXino-Lime_defconfig @@ -1,6 +1,6 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPC(3),USB_EHCI" -CONFIG_FDTFILE="sun7i-a20-olinuxino-lime.dtb" +CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-olinuxino-lime" CONFIG_ARM=y CONFIG_ARCH_SUNXI=y CONFIG_MACH_SUN7I=y diff --git a/configs/A20-OLinuXino_MICRO_defconfig b/configs/A20-OLinuXino_MICRO_defconfig index 11fb76096f57055e7779d55e23a8487f94e83eea..a530d13ba8acd41196048e29aaa3c19f45be7b17 100644 --- a/configs/A20-OLinuXino_MICRO_defconfig +++ b/configs/A20-OLinuXino_MICRO_defconfig @@ -1,6 +1,6 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPB(8),USB_EHCI" -CONFIG_FDTFILE="sun7i-a20-olinuxino-micro.dtb" +CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-olinuxino-micro" CONFIG_MMC_SUNXI_SLOT_EXTRA=3 CONFIG_VIDEO_VGA=y CONFIG_MMC0_CD_PIN="PH1" diff --git a/configs/Ainol_AW1_defconfig b/configs/Ainol_AW1_defconfig index 5b3dd8b26f85e4bddc9202adbdf92a7e7c3c2834..ff414441512cf3f07dff8dd2bee9ce783e43a77f 100644 --- a/configs/Ainol_AW1_defconfig +++ b/configs/Ainol_AW1_defconfig @@ -5,7 +5,7 @@ # Also see: http://linux-sunxi.org/Ainol_AW1 CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER" -CONFIG_FDTFILE="sun7i-a20-ainol-aw1.dtb" +CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-ainol-aw1" CONFIG_MMC0_CD_PIN="PH1" CONFIG_USB_MUSB_SUNXI=y CONFIG_USB0_VBUS_PIN="PB9" diff --git a/configs/Ampe_A76_defconfig b/configs/Ampe_A76_defconfig index f4c7662e80306165a579fdde58335bc61d6b9bb6..375cc68f703ad4682308bcd3a3daa4af0a5f8b84 100644 --- a/configs/Ampe_A76_defconfig +++ b/configs/Ampe_A76_defconfig @@ -1,6 +1,6 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=2,AXP209_POWER" -CONFIG_FDTFILE="sun5i-a13-ampe-a76.dtb" +CONFIG_DEFAULT_DEVICE_TREE="sun5i-a13-ampe-a76" CONFIG_MMC0_CD_PIN="PG0" CONFIG_USB_MUSB_SUNXI=y CONFIG_USB0_VBUS_PIN="PG12" diff --git a/configs/Astar_MID756_defconfig b/configs/Astar_MID756_defconfig index 2f3b71f97054aeae8eae213df534141f5f051614..0072ab8b89df76456b9f4f46e464c62f3d288f74 100644 --- a/configs/Astar_MID756_defconfig +++ b/configs/Astar_MID756_defconfig @@ -4,7 +4,7 @@ # Also see: http://linux-sunxi.org/Softwinner_astar-rda CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=5" -CONFIG_FDTFILE="sun8i-a33-astar-mid756.dtb" +CONFIG_DEFAULT_DEVICE_TREE="sun8i-a33-astar-mid756" CONFIG_USB_MUSB_SUNXI=y CONFIG_USB0_VBUS_PIN="AXP0-VBUS-ENABLE" CONFIG_USB0_VBUS_DET="AXP0-VBUS-DETECT" diff --git a/configs/Auxtek-T004_defconfig b/configs/Auxtek-T004_defconfig index ee6d6f69ab0b40233315421af99bc9997de3602a..f3f42e4ced4a7d7e87ed616ec5d3642b1bcc9b9a 100644 --- a/configs/Auxtek-T004_defconfig +++ b/configs/Auxtek-T004_defconfig @@ -1,6 +1,6 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="AXP152_POWER,USB_EHCI" -CONFIG_FDTFILE="sun5i-a10s-auxtek-t004.dtb" +CONFIG_DEFAULT_DEVICE_TREE="sun5i-a10s-auxtek-t004" CONFIG_USB1_VBUS_PIN="PG13" CONFIG_ARM=y CONFIG_ARCH_SUNXI=y diff --git a/configs/Bananapi_defconfig b/configs/Bananapi_defconfig index 36a867114eefa5fd34266095d351d1b06065711c..0e1d7b5231dafa3581bbf89b5be3436813e4e201 100644 --- a/configs/Bananapi_defconfig +++ b/configs/Bananapi_defconfig @@ -1,6 +1,6 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,RGMII,MACPWR=SUNXI_GPH(23),AHCI,USB_EHCI" -CONFIG_FDTFILE="sun7i-a20-bananapi.dtb" +CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-bananapi" CONFIG_GMAC_TX_DELAY=3 CONFIG_ARM=y CONFIG_ARCH_SUNXI=y diff --git a/configs/Bananapro_defconfig b/configs/Bananapro_defconfig index 236a99240f7a113bfcb3b6fcdba40892bb4abcf1..b68333f044036dd14e6f54664250d5a0fcaec337 100644 --- a/configs/Bananapro_defconfig +++ b/configs/Bananapro_defconfig @@ -1,6 +1,6 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,RGMII,MACPWR=SUNXI_GPH(23),AHCI,USB_EHCI" -CONFIG_FDTFILE="sun7i-a20-bananapro.dtb" +CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-bananapro" CONFIG_USB1_VBUS_PIN="PH0" CONFIG_USB2_VBUS_PIN="PH1" CONFIG_GMAC_TX_DELAY=3 diff --git a/configs/CSQ_CS908_defconfig b/configs/CSQ_CS908_defconfig index 776636ef436981ebc602df3f2709660ed4643b87..4d9e1e9b10f482c356285a97820d4af80a2f9184 100644 --- a/configs/CSQ_CS908_defconfig +++ b/configs/CSQ_CS908_defconfig @@ -1,6 +1,6 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="USB_EHCI,SUNXI_GMAC" -CONFIG_FDTFILE="sun6i-a31s-cs908.dtb" +CONFIG_DEFAULT_DEVICE_TREE="sun6i-a31s-cs908" CONFIG_ARM=y CONFIG_ARCH_SUNXI=y CONFIG_MACH_SUN6I=y diff --git a/configs/Chuwi_V7_CW0825_defconfig b/configs/Chuwi_V7_CW0825_defconfig index 03f93617304cf581a882ea622a704bcf09c0ce27..9053075d9e33fc2e4e302bdacaf329769692568a 100644 --- a/configs/Chuwi_V7_CW0825_defconfig +++ b/configs/Chuwi_V7_CW0825_defconfig @@ -1,6 +1,6 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER" -CONFIG_FDTFILE="sun4i-a10-chuwi-v7-cw0825.dtb" +CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-chuwi-v7-cw0825" CONFIG_USB_MUSB_SUNXI=y CONFIG_USB0_VBUS_PIN="PB9" CONFIG_USB0_VBUS_DET="PH5" diff --git a/configs/Colombus_defconfig b/configs/Colombus_defconfig index 810c88f23076990144bf69f3d0e3467a3279d581..96b55baa5f30b62898354b7b51f11c1e49c529a9 100644 --- a/configs/Colombus_defconfig +++ b/configs/Colombus_defconfig @@ -1,6 +1,6 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="USB_EHCI,SUNXI_GMAC" -CONFIG_FDTFILE="sun6i-a31-colombus.dtb" +CONFIG_DEFAULT_DEVICE_TREE="sun6i-a31-colombus" CONFIG_ARM=y CONFIG_ARCH_SUNXI=y CONFIG_MACH_SUN6I=y diff --git a/configs/Cubieboard2_defconfig b/configs/Cubieboard2_defconfig index 7f65c1d4726474fdfa5e21714654ab38357767bc..ca0be1f57901416029b73692e05074d7402bc0f1 100644 --- a/configs/Cubieboard2_defconfig +++ b/configs/Cubieboard2_defconfig @@ -1,6 +1,6 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPB(8),USB_EHCI" -CONFIG_FDTFILE="sun7i-a20-cubieboard2.dtb" +CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-cubieboard2" CONFIG_MMC0_CD_PIN="PH1" CONFIG_ARM=y CONFIG_ARCH_SUNXI=y diff --git a/configs/Cubieboard_defconfig b/configs/Cubieboard_defconfig index 0b5c536e856bb7feabb1a18466c1805815d057c2..09b67ff944fc0c6029a77f7d0016d83619298b85 100644 --- a/configs/Cubieboard_defconfig +++ b/configs/Cubieboard_defconfig @@ -1,6 +1,6 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_EMAC,AHCI,SATAPWR=SUNXI_GPB(8),USB_EHCI" -CONFIG_FDTFILE="sun4i-a10-cubieboard.dtb" +CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-cubieboard" CONFIG_ARM=y CONFIG_ARCH_SUNXI=y CONFIG_MACH_SUN4I=y diff --git a/configs/Cubietruck_defconfig b/configs/Cubietruck_defconfig index b8418f7ebac0581945199828dfbfccfbb27c939e..a05cf2bdb98bbbba751515a01565e2455c047e1c 100644 --- a/configs/Cubietruck_defconfig +++ b/configs/Cubietruck_defconfig @@ -1,6 +1,6 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,RGMII,AHCI,SATAPWR=SUNXI_GPH(12),USB_EHCI" -CONFIG_FDTFILE="sun7i-a20-cubietruck.dtb" +CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-cubietruck" CONFIG_GMAC_TX_DELAY=1 CONFIG_VIDEO_VGA=y CONFIG_ARM=y diff --git a/configs/Hummingbird_A31_defconfig b/configs/Hummingbird_A31_defconfig index 8a11e09d8795ca7182814a5bd6006c096e73abed..a389b0a5b10a6a92e201dd8267c4d18941e2605b 100644 --- a/configs/Hummingbird_A31_defconfig +++ b/configs/Hummingbird_A31_defconfig @@ -1,6 +1,6 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="USB_EHCI,SUNXI_GMAC,RGMII,MACPWR=SUNXI_GPA(21)" -CONFIG_FDTFILE="sun6i-a31-hummingbird.dtb" +CONFIG_DEFAULT_DEVICE_TREE="sun6i-a31-hummingbird" CONFIG_VIDEO_VGA_VIA_LCD=y CONFIG_VIDEO_VGA_EXTERNAL_DAC_EN="PH25" CONFIG_ARM=y diff --git a/configs/Hyundai_A7HD_defconfig b/configs/Hyundai_A7HD_defconfig index b2bba11e6004aa9215110e960baa514763959d02..3b71719a4c40d24830e9e547dedddce52376b590 100644 --- a/configs/Hyundai_A7HD_defconfig +++ b/configs/Hyundai_A7HD_defconfig @@ -3,7 +3,7 @@ # headphones port for details see: http://linux-sunxi.org/Hyundai_A7HD CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER" -CONFIG_FDTFILE="sun4i-a10-hyundai-a7hd.dtb" +CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-hyundai-a7hd" CONFIG_USB_MUSB_SUNXI=y CONFIG_USB0_VBUS_PIN="PB09" CONFIG_USB0_VBUS_DET="PH5" diff --git a/configs/Ippo_q8h_v1_2_a33_1024x600_defconfig b/configs/Ippo_q8h_v1_2_a33_1024x600_defconfig index b5d2f751f665a3ec82d1045efa9b10601597526c..f54e2eefbf764db9aa2782cef66fbe62ab471378 100644 --- a/configs/Ippo_q8h_v1_2_a33_1024x600_defconfig +++ b/configs/Ippo_q8h_v1_2_a33_1024x600_defconfig @@ -2,7 +2,7 @@ # with an A33 SoC (the pcb can take an A23 or an A33), and a 1024x600 LCD CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=5" -CONFIG_FDTFILE="sun8i-a33-ippo-q8h-v1.2-lcd1024x600.dtb" +CONFIG_DEFAULT_DEVICE_TREE="sun8i-a33-ippo-q8h-v1.2-lcd1024x600" CONFIG_USB_MUSB_SUNXI=y CONFIG_USB0_VBUS_PIN="AXP0-VBUS-ENABLE" CONFIG_USB0_VBUS_DET="AXP0-VBUS-DETECT" diff --git a/configs/Ippo_q8h_v1_2_defconfig b/configs/Ippo_q8h_v1_2_defconfig index 5b0e82d3e42406be2cbbfad7597f7e2713c657a4..a6d58e7c734abb13b48513de0591998b1c77096f 100644 --- a/configs/Ippo_q8h_v1_2_defconfig +++ b/configs/Ippo_q8h_v1_2_defconfig @@ -1,6 +1,6 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=5" -CONFIG_FDTFILE="sun8i-a23-ippo-q8h-v1.2.dtb" +CONFIG_DEFAULT_DEVICE_TREE="sun8i-a23-ippo-q8h-v1.2" CONFIG_USB_MUSB_SUNXI=y CONFIG_USB0_VBUS_PIN="AXP0-VBUS-ENABLE" CONFIG_USB0_VBUS_DET="AXP0-VBUS-DETECT" diff --git a/configs/Ippo_q8h_v5_defconfig b/configs/Ippo_q8h_v5_defconfig index 25cfb8e1607a5766cb5304962a85dc3804807794..7f6e4cec71996b8cec4352afa13fe9d2a30fc8cb 100644 --- a/configs/Ippo_q8h_v5_defconfig +++ b/configs/Ippo_q8h_v5_defconfig @@ -1,6 +1,6 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=5" -CONFIG_FDTFILE="sun8i-a23-ippo-q8h-v5.dtb" +CONFIG_DEFAULT_DEVICE_TREE="sun8i-a23-ippo-q8h-v5" CONFIG_USB_MUSB_SUNXI=y CONFIG_USB0_VBUS_PIN="AXP0-VBUS-ENABLE" CONFIG_USB0_VBUS_DET="AXP0-VBUS-DETECT" diff --git a/configs/Linksprite_pcDuino3_Nano_defconfig b/configs/Linksprite_pcDuino3_Nano_defconfig index 9d171bd4ffd9b2043e48ea92354d7c441f117d4a..51f811a800b882f734bba657b931b953d87caaea 100644 --- a/configs/Linksprite_pcDuino3_Nano_defconfig +++ b/configs/Linksprite_pcDuino3_Nano_defconfig @@ -1,6 +1,6 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,RGMII,AHCI,SATAPWR=SUNXI_GPH(2),USB_EHCI" -CONFIG_FDTFILE="sun7i-a20-pcduino3-nano.dtb" +CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-pcduino3-nano" CONFIG_GMAC_TX_DELAY=3 CONFIG_USB1_VBUS_PIN="PH11" CONFIG_ARM=y diff --git a/configs/Linksprite_pcDuino3_defconfig b/configs/Linksprite_pcDuino3_defconfig index e5aabdb8883c92e40e6be7a3c71a0ce90dbedd64..d51d34d421030f968c7fb0a1f0257f11b752b916 100644 --- a/configs/Linksprite_pcDuino3_defconfig +++ b/configs/Linksprite_pcDuino3_defconfig @@ -1,6 +1,6 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPH(2),USB_EHCI" -CONFIG_FDTFILE="sun7i-a20-pcduino3.dtb" +CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-pcduino3" CONFIG_ARM=y CONFIG_ARCH_SUNXI=y CONFIG_MACH_SUN7I=y @@ -10,7 +10,6 @@ CONFIG_DRAM_EMR1=4 CONFIG_DM=y CONFIG_DM_GPIO=y CONFIG_DM_SERIAL=y -CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-pcduino3" CONFIG_OF_CONTROL=y CONFIG_SPL_DISABLE_OF_CONTROL=y CONFIG_OF_SEPARATE=y diff --git a/configs/Linksprite_pcDuino_defconfig b/configs/Linksprite_pcDuino_defconfig index 3bed6aa3a86424b4e9a5d7c648e135ebfcc4ea19..93366d318c346c45fee74c6d3cae75428314cf23 100644 --- a/configs/Linksprite_pcDuino_defconfig +++ b/configs/Linksprite_pcDuino_defconfig @@ -1,6 +1,6 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_EMAC,USB_EHCI" -CONFIG_FDTFILE="sun4i-a10-pcduino.dtb" +CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-pcduino" CONFIG_ARM=y CONFIG_ARCH_SUNXI=y CONFIG_MACH_SUN4I=y diff --git a/configs/MK808C_defconfig b/configs/MK808C_defconfig index d50d7859a79ebcf0f893d73cbdbfceeb5b63c0c0..fcacfc65e7cbe888f616b9da501650b1d1f05bd0 100644 --- a/configs/MK808C_defconfig +++ b/configs/MK808C_defconfig @@ -4,7 +4,7 @@ # 1 USB A, 1 USB mini OTG, Bluetooth and Wireless LAN. CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,USB_EHCI" -CONFIG_FDTFILE="sun7i-a20-mk808c.dtb" +CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-mk808c" CONFIG_ARM=y CONFIG_ARCH_SUNXI=y CONFIG_MACH_SUN7I=y diff --git a/configs/MSI_Primo73_defconfig b/configs/MSI_Primo73_defconfig index 5227b6f42acba4ce76026f92ae8c7f595b67435c..c767b3d0f94cd86dd082b88ab900378819a24b3b 100644 --- a/configs/MSI_Primo73_defconfig +++ b/configs/MSI_Primo73_defconfig @@ -8,7 +8,7 @@ # http://linux-sunxi.org/MSI_Primo73 CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER" -CONFIG_FDTFILE="sun7i-a20-primo73.dtb" +CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-primo73" CONFIG_VIDEO_LCD_MODE="x:1024,y:600,depth:18,pclk_khz:60000,le:60,ri:160,up:13,lo:12,hs:100,vs:10,sync:3,vmode:0" CONFIG_VIDEO_LCD_DCLK_PHASE=0 CONFIG_VIDEO_LCD_POWER="PH8" diff --git a/configs/MSI_Primo81_defconfig b/configs/MSI_Primo81_defconfig index b6aa876cb6d1b568e184ccf6410332cf9f3adbc1..7e41e4b0293125782410e2893acce24d40f8ecf3 100644 --- a/configs/MSI_Primo81_defconfig +++ b/configs/MSI_Primo81_defconfig @@ -9,7 +9,7 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="" -CONFIG_FDTFILE="sun6i-a31s-primo81.dtb" +CONFIG_DEFAULT_DEVICE_TREE="sun6i-a31s-primo81" CONFIG_VIDEO_LCD_MODE="x:768,y:1024,depth:18,pclk_khz:66000,le:56,ri:60,up:30,lo:36,hs:64,vs:50,sync:3,vmode:0" CONFIG_VIDEO_LCD_PANEL_MIPI_4_LANE_513_MBPS_VIA_SSD2828=y CONFIG_VIDEO_LCD_SSD2828_TX_CLK=27 diff --git a/configs/Marsboard_A10_defconfig b/configs/Marsboard_A10_defconfig index 74ce12c2a3f80721e0a6d0f8059f19629e5272e1..e47709fc0339d0eaa5c58790c30dd0a0e2347a5a 100644 --- a/configs/Marsboard_A10_defconfig +++ b/configs/Marsboard_A10_defconfig @@ -1,6 +1,6 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="SUNXI_EMAC,AHCI,USB_EHCI" -CONFIG_FDTFILE="sun4i-a10-marsboard.dtb" +CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-marsboard" CONFIG_ARM=y CONFIG_ARCH_SUNXI=y CONFIG_MACH_SUN4I=y diff --git a/configs/Mele_A1000_defconfig b/configs/Mele_A1000_defconfig index c30e18b5baa500d8ff9a87ba1cd5b40f64bfcc0a..32b20a78f0a5b198edeb60d0921043414005946d 100644 --- a/configs/Mele_A1000_defconfig +++ b/configs/Mele_A1000_defconfig @@ -1,6 +1,6 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_EMAC,MACPWR=SUNXI_GPH(15),AHCI,USB_EHCI" -CONFIG_FDTFILE="sun4i-a10-a1000.dtb" +CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-a1000" CONFIG_VIDEO_VGA=y CONFIG_ARM=y CONFIG_ARCH_SUNXI=y diff --git a/configs/Mele_I7_defconfig b/configs/Mele_I7_defconfig index e91d507f4dd97ff6c35e8de477f134364f3452b3..9f144611891c1239b62bb3df4209c40202f615fb 100644 --- a/configs/Mele_I7_defconfig +++ b/configs/Mele_I7_defconfig @@ -6,7 +6,7 @@ # For more details see: http://linux-sunxi.org/Mele_I7 CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="USB_EHCI,SUNXI_GMAC" -CONFIG_FDTFILE="sun6i-a31-i7.dtb" +CONFIG_DEFAULT_DEVICE_TREE="sun6i-a31-i7" CONFIG_ARM=y CONFIG_ARCH_SUNXI=y CONFIG_MACH_SUN6I=y diff --git a/configs/Mele_M3_defconfig b/configs/Mele_M3_defconfig index a74dd2df25a6e9a1bc7effb362fd4055dfd1fd0a..10bf8804e2f7d06a908e3c580c7473e6f4428521 100644 --- a/configs/Mele_M3_defconfig +++ b/configs/Mele_M3_defconfig @@ -1,6 +1,6 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,USB_EHCI" -CONFIG_FDTFILE="sun7i-a20-m3.dtb" +CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-m3" CONFIG_VIDEO_VGA=y CONFIG_MMC_SUNXI_SLOT_EXTRA=2 CONFIG_MMC0_CD_PIN="PH1" diff --git a/configs/Mele_M5_defconfig b/configs/Mele_M5_defconfig index d0f0425a9282ab2a3602011131a086c785bf0a8d..7e371405365ba3a57b79ab3d7e26ae669dc801d6 100644 --- a/configs/Mele_M5_defconfig +++ b/configs/Mele_M5_defconfig @@ -1,6 +1,6 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,AHCI,USB_EHCI,STATUSLED=234" -CONFIG_FDTFILE="sun7i-a20-m5.dtb" +CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-m5" CONFIG_VIDEO_HDMI=y CONFIG_MMC0_CD_PIN="PH1" CONFIG_USB1_VBUS_PIN="PH6" diff --git a/configs/Mele_M9_defconfig b/configs/Mele_M9_defconfig index 592322d41f538a1663477f6e10f6553b3f20f6e8..da592fa759d22cf64ab4a22816c48881bf159fd2 100644 --- a/configs/Mele_M9_defconfig +++ b/configs/Mele_M9_defconfig @@ -1,6 +1,6 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="USB_EHCI,SUNXI_GMAC" -CONFIG_FDTFILE="sun6i-a31-m9.dtb" +CONFIG_DEFAULT_DEVICE_TREE="sun6i-a31-m9" CONFIG_ARM=y CONFIG_ARCH_SUNXI=y CONFIG_MACH_SUN6I=y diff --git a/configs/Mini-X_defconfig b/configs/Mini-X_defconfig index a4cd5c7208cd5e992f43abb16d972282bb4501e2..434c5611f0f941984e7e0f0b90b2a056f20ed3cc 100644 --- a/configs/Mini-X_defconfig +++ b/configs/Mini-X_defconfig @@ -1,6 +1,6 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,USB_EHCI" -CONFIG_FDTFILE="sun4i-a10-mini-xplus.dtb" +CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-mini-xplus" CONFIG_ARM=y CONFIG_ARCH_SUNXI=y CONFIG_MACH_SUN4I=y diff --git a/configs/Orangepi_defconfig b/configs/Orangepi_defconfig index 5bf9cacc4ca2eb0cca20fbceeb14fd27ec379577..110ec0cdc245ab51af1dce23836d7bc65e31145f 100644 --- a/configs/Orangepi_defconfig +++ b/configs/Orangepi_defconfig @@ -7,7 +7,7 @@ # http://www.orangepi.org/ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,RGMII,MACPWR=SUNXI_GPH(23),AHCI,USB_EHCI" -CONFIG_FDTFILE="sun7i-a20-orangepi.dtb" +CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-orangepi" CONFIG_GMAC_TX_DELAY=3 CONFIG_USB1_VBUS_PIN="PH26" CONFIG_USB2_VBUS_PIN="PH22" diff --git a/configs/Orangepi_mini_defconfig b/configs/Orangepi_mini_defconfig index fce05555dde52294ab78170a5f0e303749e8a45c..119b803e085b5c50c8f7274426fc41eb332240fb 100644 --- a/configs/Orangepi_mini_defconfig +++ b/configs/Orangepi_mini_defconfig @@ -8,7 +8,7 @@ # http://www.orangepi.org/ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,RGMII,MACPWR=SUNXI_GPH(23),AHCI,USB_EHCI" -CONFIG_FDTFILE="sun7i-a20-orangepi-mini.dtb" +CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-orangepi-mini" CONFIG_MMC_SUNXI_SLOT_EXTRA=3 CONFIG_MMC0_CD_PIN="PH10" CONFIG_MMC3_CD_PIN="PH11" diff --git a/configs/TZX-Q8-713B7_defconfig b/configs/TZX-Q8-713B7_defconfig index f22952694c92a279223b614763c462d22926bee1..3484a2f0cf7ba3b7b688edd083bc56a2e60c2f2a 100644 --- a/configs/TZX-Q8-713B7_defconfig +++ b/configs/TZX-Q8-713B7_defconfig @@ -1,6 +1,6 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=2,AXP209_POWER" -CONFIG_FDTFILE="sun5i-a13-tzx-q8-713b7.dtb" +CONFIG_DEFAULT_DEVICE_TREE="sun5i-a13-tzx-q8-713b7" CONFIG_MMC0_CD_PIN="PG0" CONFIG_USB_MUSB_SUNXI=y CONFIG_USB0_VBUS_PIN="PG12" diff --git a/configs/UTOO_P66_defconfig b/configs/UTOO_P66_defconfig index 7d97b3b9568bf2b56f8a16db725cf2bebdca21c3..0815fd15e092c790cfe6fc912479f7473f15442a 100644 --- a/configs/UTOO_P66_defconfig +++ b/configs/UTOO_P66_defconfig @@ -1,6 +1,6 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER" -CONFIG_FDTFILE="sun5i-a13-utoo-p66.dtb" +CONFIG_DEFAULT_DEVICE_TREE="sun5i-a13-utoo-p66" CONFIG_USB_MUSB_SUNXI=y CONFIG_USB0_VBUS_PIN="PB04" CONFIG_USB0_VBUS_DET="PG01" diff --git a/configs/Wexler_TAB7200_defconfig b/configs/Wexler_TAB7200_defconfig index 3f9318fbe28b26821ae20b0abd9d1105a697a4ee..9c6dfd6c35909957f726dfcb0e8ea16df5147569 100644 --- a/configs/Wexler_TAB7200_defconfig +++ b/configs/Wexler_TAB7200_defconfig @@ -1,6 +1,6 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,USB_EHCI" -CONFIG_FDTFILE="sun7i-a20-wexler-tab7200.dtb" +CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-wexler-tab7200" CONFIG_VIDEO_LCD_MODE="x:800,y:480,depth:24,pclk_khz:33000,le:45,ri:210,up:22,lo:22,hs:1,vs:1,sync:3,vmode:0" CONFIG_VIDEO_LCD_POWER="PH8" CONFIG_VIDEO_LCD_BL_EN="PH7" diff --git a/configs/Wits_Pro_A20_DKT_defconfig b/configs/Wits_Pro_A20_DKT_defconfig index 92c33b399591743d222c15f6078741963b06d416..4bb4452b43d1af5b410de52e4695c61a8479f9e9 100644 --- a/configs/Wits_Pro_A20_DKT_defconfig +++ b/configs/Wits_Pro_A20_DKT_defconfig @@ -1,6 +1,6 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,RGMII,AHCI,USB_EHCI" -CONFIG_FDTFILE="sun7i-a20-wits-pro-a20-dkt.dtb" +CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-wits-pro-a20-dkt" CONFIG_VIDEO_LCD_MODE="x:1024,y:768,depth:24,pclk_khz:65000,le:159,ri:160,up:22,lo:15,hs:1,vs:1,sync:3,vmode:0" CONFIG_VIDEO_LCD_POWER="PH8" CONFIG_VIDEO_LCD_BL_EN="PH7" diff --git a/configs/Yones_Toptech_BD1078_defconfig b/configs/Yones_Toptech_BD1078_defconfig index cc8e831990fef9da34b09fea6a7f5fd5b9a755b3..b675726fc83d186f868e8dae7cc24b72fd33bd12 100644 --- a/configs/Yones_Toptech_BD1078_defconfig +++ b/configs/Yones_Toptech_BD1078_defconfig @@ -6,7 +6,7 @@ # Also see: http://linux-sunxi.org/Yones_Toptech_BD1078 CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER" -CONFIG_FDTFILE="sun7i-a20-yones-toptech-bd1078.dtb" +CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-yones-toptech-bd1078" CONFIG_MMC_SUNXI_SLOT_EXTRA=1 CONFIG_MMC0_CD_PIN="PH1" CONFIG_MMC1_CD_PIN="PH2" diff --git a/configs/ba10_tv_box_defconfig b/configs/ba10_tv_box_defconfig index 503cd876255178edb31a0b478d7ee2e8c31c2046..9909a949076666390968075711695f8d34d3c3dd 100644 --- a/configs/ba10_tv_box_defconfig +++ b/configs/ba10_tv_box_defconfig @@ -1,6 +1,6 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_EMAC,USB_EHCI" -CONFIG_FDTFILE="sun4i-a10-ba10-tvbox.dtb" +CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-ba10-tvbox" CONFIG_USB2_VBUS_PIN="PH12" CONFIG_ARM=y CONFIG_ARCH_SUNXI=y diff --git a/configs/forfun_q88db_defconfig b/configs/forfun_q88db_defconfig index 2f2fa19ef4d37309458d703f10bf4ea9c34bac8a..77229159b0f87edb3bd93c77d93484bb79f1f580 100644 --- a/configs/forfun_q88db_defconfig +++ b/configs/forfun_q88db_defconfig @@ -1,6 +1,6 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER" -CONFIG_FDTFILE="sun5i-a13-forfun-q88db.dtb" +CONFIG_DEFAULT_DEVICE_TREE="sun5i-a13-forfun-q88db" CONFIG_USB_MUSB_SUNXI=y CONFIG_USB0_VBUS_PIN="PG12" CONFIG_USB0_VBUS_DET="PG1" diff --git a/configs/i12-tvbox_defconfig b/configs/i12-tvbox_defconfig index b10f4d0e76da3db0c64d8bc84dc78fcab847a3d6..6027b87e99d3810910fd3b602a3d4871f21ca873 100644 --- a/configs/i12-tvbox_defconfig +++ b/configs/i12-tvbox_defconfig @@ -1,6 +1,6 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,MACPWR=SUNXI_GPH(21),USB_EHCI" -CONFIG_FDTFILE="sun7i-a20-i12-tvbox.dtb" +CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-i12-tvbox" CONFIG_ARM=y CONFIG_ARCH_SUNXI=y CONFIG_MACH_SUN7I=y diff --git a/configs/iNet_3F_defconfig b/configs/iNet_3F_defconfig index 4225b85ebc4b52cb02ffbda01e3463a9d3c12f00..0ae11a790421b5d5a6eeabe068ffc423e7810cae 100644 --- a/configs/iNet_3F_defconfig +++ b/configs/iNet_3F_defconfig @@ -2,7 +2,7 @@ # Also see: http://linux-sunxi.org/INet_3F CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER" -CONFIG_FDTFILE="sun4i-a10-inet-3f.dtb" +CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-inet-3f" CONFIG_MMC0_CD_PIN="PH1" CONFIG_USB_MUSB_SUNXI=y CONFIG_USB0_VBUS_PIN="PB9" diff --git a/configs/iNet_3W_defconfig b/configs/iNet_3W_defconfig index 0a8e0f535f8acf76480469800b387f609c9dbd44..204f887b19b747b6be7e2aee5164c0dbbec8461a 100644 --- a/configs/iNet_3W_defconfig +++ b/configs/iNet_3W_defconfig @@ -2,7 +2,7 @@ # Also see: http://linux-sunxi.org/INet_3W CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER" -CONFIG_FDTFILE="sun4i-a10-inet-3w.dtb" +CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-inet-3w" CONFIG_MMC0_CD_PIN="PH20" CONFIG_USB_MUSB_SUNXI=y CONFIG_USB0_VBUS_PIN="PB9" diff --git a/configs/iNet_86VS_defconfig b/configs/iNet_86VS_defconfig index a5ac57fc090aa9c5ba081bfea1d130aa8620e132..0646f9f46961fbd46103fbf1635c0653c97d7e47 100644 --- a/configs/iNet_86VS_defconfig +++ b/configs/iNet_86VS_defconfig @@ -1,6 +1,6 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER" -CONFIG_FDTFILE="sun5i-a13-inet-86vs.dtb" +CONFIG_DEFAULT_DEVICE_TREE="sun5i-a13-inet-86vs" CONFIG_USB_MUSB_SUNXI=y CONFIG_USB0_VBUS_PIN="PG12" CONFIG_USB0_VBUS_DET="PG1" diff --git a/configs/jesurun_q5_defconfig b/configs/jesurun_q5_defconfig index 8c9801918f1224ae470c914014599aecb5028fb9..c0d87cce0e7ed736a5171324cf60688da1062cc8 100644 --- a/configs/jesurun_q5_defconfig +++ b/configs/jesurun_q5_defconfig @@ -11,7 +11,7 @@ # For more details see: http://linux-sunxi.org/Jesurun_Q5 CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_EMAC,USB_EHCI,MACPWR=SUNXI_GPH(19)" -CONFIG_FDTFILE="sun4i-a10-jesurun-q5.dtb" +CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-jesurun-q5" CONFIG_ARM=y CONFIG_ARCH_SUNXI=y CONFIG_MACH_SUN4I=y diff --git a/configs/mixtile_loftq_defconfig b/configs/mixtile_loftq_defconfig index 8275df846248ea280504e3fb9dc407ba2f2466c8..65058227ba0c4a47e21251c169161e4b265fa9a7 100644 --- a/configs/mixtile_loftq_defconfig +++ b/configs/mixtile_loftq_defconfig @@ -6,6 +6,7 @@ # Also see http://focalcrest.com/en/pc.html#pro02 CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="USB_EHCI,SUNXI_GMAC,RGMII,MACPWR=SUNXI_GPA(21)" +CONFIG_DEFAULT_DEVICE_TREE="sun6i-a31-mixtile-loftq" CONFIG_ARM=y CONFIG_ARCH_SUNXI=y CONFIG_MACH_SUN6I=y diff --git a/configs/mk802_a10s_defconfig b/configs/mk802_a10s_defconfig index 701b92b808183e9fb31960ad20bd1e0e714642bf..8e070b9f4dc405f7a67b5db107b32ed3a9b433d1 100644 --- a/configs/mk802_a10s_defconfig +++ b/configs/mk802_a10s_defconfig @@ -1,6 +1,6 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="AXP152_POWER,USB_EHCI" -CONFIG_FDTFILE="sun5i-a10s-mk802.dtb" +CONFIG_DEFAULT_DEVICE_TREE="sun5i-a10s-mk802" CONFIG_USB1_VBUS_PIN="PB10" CONFIG_ARM=y CONFIG_ARCH_SUNXI=y diff --git a/configs/mk802_defconfig b/configs/mk802_defconfig index 0fe6edba39260f76afafda54162885ce18bffe7a..92b9ae450cbc7d2064e0fecfa326b5f83a358dfb 100644 --- a/configs/mk802_defconfig +++ b/configs/mk802_defconfig @@ -1,6 +1,6 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="USB_EHCI" -CONFIG_FDTFILE="sun4i-a10-mk802.dtb" +CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-mk802" CONFIG_USB2_VBUS_PIN="PH12" CONFIG_ARM=y CONFIG_ARCH_SUNXI=y diff --git a/configs/mk802ii_defconfig b/configs/mk802ii_defconfig index 073d5195d79a20335befd671ab90be3d23422637..447d128bde2140aa7492af9e94dabc869b2dd64f 100644 --- a/configs/mk802ii_defconfig +++ b/configs/mk802ii_defconfig @@ -1,6 +1,6 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,USB_EHCI" -CONFIG_FDTFILE="sun4i-a10-mk802ii.dtb" +CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-mk802ii" CONFIG_ARM=y CONFIG_ARCH_SUNXI=y CONFIG_MACH_SUN4I=y diff --git a/configs/r7-tv-dongle_defconfig b/configs/r7-tv-dongle_defconfig index 563fa1afbed97da87dbb0da83bf746de94b28fab..d7ed165b37f7dd50fd99639e621e8ea34ec573df 100644 --- a/configs/r7-tv-dongle_defconfig +++ b/configs/r7-tv-dongle_defconfig @@ -1,6 +1,6 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="AXP152_POWER,USB_EHCI" -CONFIG_FDTFILE="sun5i-a10s-r7-tv-dongle.dtb" +CONFIG_DEFAULT_DEVICE_TREE="sun5i-a10s-r7-tv-dongle" CONFIG_USB1_VBUS_PIN="PG13" CONFIG_ARM=y CONFIG_ARCH_SUNXI=y diff --git a/configs/sunxi_Gemei_G9_defconfig b/configs/sunxi_Gemei_G9_defconfig index 1e13fea39da567c4a0b22380cf98d7f7803d7b7d..c46b7256a888dad755b3443e5ee13358d0895dd1 100644 --- a/configs/sunxi_Gemei_G9_defconfig +++ b/configs/sunxi_Gemei_G9_defconfig @@ -6,7 +6,7 @@ # More details are available at: http://linux-sunxi.org/Gemei_G9 CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,USB_EHCI" -CONFIG_FDTFILE="sun4i-gemei-g9.dtb" +CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-gemei-g9" CONFIG_VIDEO_LCD_MODE="x:1024,y:768,depth:18,pclk_khz:100000,le:799,ri:260,up:15,lo:16,hs:1,vs:1,sync:3,vmode:0" CONFIG_VIDEO_LCD_PANEL_LVDS=y CONFIG_VIDEO_LCD_POWER="PH8" diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h index 28eccd5070f7a045e510223798683e67124d95db..cb713230ae3609decd5631611de89e850dd7fa4b 100644 --- a/include/configs/sunxi-common.h +++ b/include/configs/sunxi-common.h @@ -402,7 +402,7 @@ extern int soft_i2c_gpio_scl; #define CONFIG_EXTRA_ENV_SETTINGS \ CONSOLE_ENV_SETTINGS \ MEM_LAYOUT_ENV_SETTINGS \ - "fdtfile=" CONFIG_FDTFILE "\0" \ + "fdtfile=" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0" \ "console=ttyS0,115200\0" \ BOOTENV