diff options
27 files changed, 36 insertions, 36 deletions
diff --git a/board/sunxi/Kconfig b/board/sunxi/Kconfig index e700495554..faa38ba27b 100644 --- a/board/sunxi/Kconfig +++ b/board/sunxi/Kconfig @@ -3,26 +3,26 @@ if ARCH_SUNXI choice prompt "Sunxi SoC Variant" -config TARGET_SUN4I +config MACH_SUN4I bool "sun4i (Allwinner A10)" select CPU_V7 select SUPPORT_SPL -config TARGET_SUN5I +config MACH_SUN5I bool "sun5i (Allwinner A13)" select CPU_V7 select SUPPORT_SPL -config TARGET_SUN6I +config MACH_SUN6I bool "sun6i (Allwinner A31)" select CPU_V7 -config TARGET_SUN7I +config MACH_SUN7I bool "sun7i (Allwinner A20)" select CPU_V7 select SUPPORT_SPL -config TARGET_SUN8I +config MACH_SUN8I bool "sun8i (Allwinner A23)" select CPU_V7 @@ -30,11 +30,11 @@ endchoice config SYS_CONFIG_NAME string - default "sun4i" if TARGET_SUN4I - default "sun5i" if TARGET_SUN5I - default "sun6i" if TARGET_SUN6I - default "sun7i" if TARGET_SUN7I - default "sun8i" if TARGET_SUN8I + default "sun4i" if MACH_SUN4I + default "sun5i" if MACH_SUN5I + default "sun6i" if MACH_SUN6I + default "sun7i" if MACH_SUN7I + default "sun8i" if MACH_SUN8I config SYS_BOARD default "sunxi" diff --git a/configs/A10-OLinuXino-Lime_defconfig b/configs/A10-OLinuXino-Lime_defconfig index 816ffb56b5..be989ebd79 100644 --- a/configs/A10-OLinuXino-Lime_defconfig +++ b/configs/A10-OLinuXino-Lime_defconfig @@ -3,4 +3,4 @@ CONFIG_SYS_EXTRA_OPTIONS="A10_OLINUXINO_L,AXP209_POWER,SUNXI_EMAC,AHCI,SATAPWR=S CONFIG_FDTFILE="sun4i-a10-olinuxino-lime.dtb" +S:CONFIG_ARM=y +S:CONFIG_ARCH_SUNXI=y -+S:CONFIG_TARGET_SUN4I=y ++S:CONFIG_MACH_SUN4I=y diff --git a/configs/A10s-OLinuXino-M_defconfig b/configs/A10s-OLinuXino-M_defconfig index 38461d133d..a27a7880b8 100644 --- a/configs/A10s-OLinuXino-M_defconfig +++ b/configs/A10s-OLinuXino-M_defconfig @@ -6,4 +6,4 @@ CONFIG_MMC_SUNXI_SLOT_EXTRA=1 +S:CONFIG_MMC1_CD_PIN="PG13" +S:CONFIG_ARM=y +S:CONFIG_ARCH_SUNXI=y -+S:CONFIG_TARGET_SUN5I=y ++S:CONFIG_MACH_SUN5I=y diff --git a/configs/A13-OLinuXinoM_defconfig b/configs/A13-OLinuXinoM_defconfig index 7a0614d341..f904b50f46 100644 --- a/configs/A13-OLinuXinoM_defconfig +++ b/configs/A13-OLinuXinoM_defconfig @@ -3,4 +3,4 @@ CONFIG_SYS_EXTRA_OPTIONS="A13_OLINUXINOM,CONS_INDEX=2,USB_EHCI,SUNXI_USB_VBUS0_G CONFIG_FDTFILE="sun5i-a13-olinuxino-micro.dtb" +S:CONFIG_ARM=y +S:CONFIG_ARCH_SUNXI=y -+S:CONFIG_TARGET_SUN5I=y ++S:CONFIG_MACH_SUN5I=y diff --git a/configs/A13-OLinuXino_defconfig b/configs/A13-OLinuXino_defconfig index 4822449a55..23dc716d0b 100644 --- a/configs/A13-OLinuXino_defconfig +++ b/configs/A13-OLinuXino_defconfig @@ -3,4 +3,4 @@ CONFIG_SYS_EXTRA_OPTIONS="A13_OLINUXINO,CONS_INDEX=2,AXP209_POWER,USB_EHCI,SUNXI CONFIG_FDTFILE="sun5i-a13-olinuxino.dtb" +S:CONFIG_ARM=y +S:CONFIG_ARCH_SUNXI=y -+S:CONFIG_TARGET_SUN5I=y ++S:CONFIG_MACH_SUN5I=y diff --git a/configs/A20-OLinuXino-Lime2_defconfig b/configs/A20-OLinuXino-Lime2_defconfig index 7933704149..e7c93b996b 100644 --- a/configs/A20-OLinuXino-Lime2_defconfig +++ b/configs/A20-OLinuXino-Lime2_defconfig @@ -3,4 +3,4 @@ CONFIG_SYS_EXTRA_OPTIONS="A20_OLINUXINO_L2,AXP209_POWER,SUNXI_GMAC,RGMII,AHCI,SA CONFIG_FDTFILE="sun7i-a20-olinuxino-lime2.dtb" +S:CONFIG_ARM=y +S:CONFIG_ARCH_SUNXI=y -+S:CONFIG_TARGET_SUN7I=y ++S:CONFIG_MACH_SUN7I=y diff --git a/configs/A20-OLinuXino-Lime_defconfig b/configs/A20-OLinuXino-Lime_defconfig index eafd73347d..975472ba47 100644 --- a/configs/A20-OLinuXino-Lime_defconfig +++ b/configs/A20-OLinuXino-Lime_defconfig @@ -3,4 +3,4 @@ CONFIG_SYS_EXTRA_OPTIONS="A20_OLINUXINO_L,AXP209_POWER,SUNXI_GMAC,AHCI,SATAPWR=S CONFIG_FDTFILE="sun7i-a20-olinuxino-lime.dtb" +S:CONFIG_ARM=y +S:CONFIG_ARCH_SUNXI=y -+S:CONFIG_TARGET_SUN7I=y ++S:CONFIG_MACH_SUN7I=y diff --git a/configs/A20-OLinuXino_MICRO_defconfig b/configs/A20-OLinuXino_MICRO_defconfig index 07edef5aa6..c2c3db6841 100644 --- a/configs/A20-OLinuXino_MICRO_defconfig +++ b/configs/A20-OLinuXino_MICRO_defconfig @@ -6,4 +6,4 @@ CONFIG_MMC_SUNXI_SLOT_EXTRA=3 +S:CONFIG_MMC3_CD_PIN="PH11" +S:CONFIG_ARM=y +S:CONFIG_ARCH_SUNXI=y -+S:CONFIG_TARGET_SUN7I=y ++S:CONFIG_MACH_SUN7I=y diff --git a/configs/Auxtek-T004_defconfig b/configs/Auxtek-T004_defconfig index a2577b8ab3..b2f4c51076 100644 --- a/configs/Auxtek-T004_defconfig +++ b/configs/Auxtek-T004_defconfig @@ -3,4 +3,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AUXTEK_T004,AXP152_POWER,USB_EHCI,SUNXI_USB_VBUS0_GPIO CONFIG_FDTFILE="sun5i-a10s-auxtek-t004.dtb" +S:CONFIG_ARM=y +S:CONFIG_ARCH_SUNXI=y -+S:CONFIG_TARGET_SUN5I=y ++S:CONFIG_MACH_SUN5I=y diff --git a/configs/Bananapi_defconfig b/configs/Bananapi_defconfig index 8f8853fa9d..ec18b9f059 100644 --- a/configs/Bananapi_defconfig +++ b/configs/Bananapi_defconfig @@ -3,4 +3,4 @@ CONFIG_SYS_EXTRA_OPTIONS="BANANAPI,AXP209_POWER,SUNXI_GMAC,RGMII,MACPWR=SUNXI_GP CONFIG_FDTFILE="sun7i-a20-bananapi.dtb" +S:CONFIG_ARM=y +S:CONFIG_ARCH_SUNXI=y -+S:CONFIG_TARGET_SUN7I=y ++S:CONFIG_MACH_SUN7I=y diff --git a/configs/Colombus_defconfig b/configs/Colombus_defconfig index b9ee7c83b9..4c0ea7859a 100644 --- a/configs/Colombus_defconfig +++ b/configs/Colombus_defconfig @@ -1,5 +1,5 @@ CONFIG_SYS_EXTRA_OPTIONS="COLOMBUS" CONFIG_ARM=y CONFIG_ARCH_SUNXI=y -CONFIG_TARGET_SUN6I=y +CONFIG_MACH_SUN6I=y CONFIG_FDTFILE="sun6i-a31-colombus.dtb" diff --git a/configs/Cubieboard2_FEL_defconfig b/configs/Cubieboard2_FEL_defconfig index 7ae7a2b55f..1e79720ac0 100644 --- a/configs/Cubieboard2_FEL_defconfig +++ b/configs/Cubieboard2_FEL_defconfig @@ -3,4 +3,4 @@ CONFIG_SYS_EXTRA_OPTIONS="CUBIEBOARD2,SPL_FEL,AXP209_POWER,SUNXI_GMAC,AHCI,SATAP CONFIG_FDTFILE="sun7i-a20-cubieboard2.dtb" +S:CONFIG_ARM=y +S:CONFIG_ARCH_SUNXI=y -+S:CONFIG_TARGET_SUN7I=y ++S:CONFIG_MACH_SUN7I=y diff --git a/configs/Cubieboard2_defconfig b/configs/Cubieboard2_defconfig index 9c5997dec6..f6872c6bca 100644 --- a/configs/Cubieboard2_defconfig +++ b/configs/Cubieboard2_defconfig @@ -3,4 +3,4 @@ CONFIG_SYS_EXTRA_OPTIONS="CUBIEBOARD2,AXP209_POWER,SUNXI_GMAC,AHCI,SATAPWR=SUNXI CONFIG_FDTFILE="sun7i-a20-cubieboard2.dtb" +S:CONFIG_ARM=y +S:CONFIG_ARCH_SUNXI=y -+S:CONFIG_TARGET_SUN7I=y ++S:CONFIG_MACH_SUN7I=y diff --git a/configs/Cubieboard_defconfig b/configs/Cubieboard_defconfig index eafa09d995..9152b253b3 100644 --- a/configs/Cubieboard_defconfig +++ b/configs/Cubieboard_defconfig @@ -3,4 +3,4 @@ CONFIG_SYS_EXTRA_OPTIONS="CUBIEBOARD,AXP209_POWER,SUNXI_EMAC,AHCI,SATAPWR=SUNXI_ CONFIG_FDTFILE="sun4i-a10-cubieboard.dtb" +S:CONFIG_ARM=y +S:CONFIG_ARCH_SUNXI=y -+S:CONFIG_TARGET_SUN4I=y ++S:CONFIG_MACH_SUN4I=y diff --git a/configs/Cubietruck_FEL_defconfig b/configs/Cubietruck_FEL_defconfig index 6218c58bc2..963ed5a017 100644 --- a/configs/Cubietruck_FEL_defconfig +++ b/configs/Cubietruck_FEL_defconfig @@ -3,4 +3,4 @@ CONFIG_SYS_EXTRA_OPTIONS="CUBIETRUCK,SPL_FEL,AXP209_POWER,SUNXI_GMAC,RGMII,AHCI, CONFIG_FDTFILE="sun7i-a20-cubietruck.dtb" +S:CONFIG_ARM=y +S:CONFIG_ARCH_SUNXI=y -+S:CONFIG_TARGET_SUN7I=y ++S:CONFIG_MACH_SUN7I=y diff --git a/configs/Cubietruck_defconfig b/configs/Cubietruck_defconfig index 9a56f180f5..7592658a2e 100644 --- a/configs/Cubietruck_defconfig +++ b/configs/Cubietruck_defconfig @@ -3,4 +3,4 @@ CONFIG_SYS_EXTRA_OPTIONS="CUBIETRUCK,AXP209_POWER,SUNXI_GMAC,RGMII,AHCI,SATAPWR= CONFIG_FDTFILE="sun7i-a20-cubietruck.dtb" +S:CONFIG_ARM=y +S:CONFIG_ARCH_SUNXI=y -+S:CONFIG_TARGET_SUN7I=y ++S:CONFIG_MACH_SUN7I=y diff --git a/configs/Ippo_q8h_v5_defconfig b/configs/Ippo_q8h_v5_defconfig index d9ea01014e..12ff70147a 100644 --- a/configs/Ippo_q8h_v5_defconfig +++ b/configs/Ippo_q8h_v5_defconfig @@ -1,5 +1,5 @@ CONFIG_SYS_EXTRA_OPTIONS="IPPO_Q8H_V5,CONS_INDEX=5" CONFIG_ARM=y CONFIG_ARCH_SUNXI=y -CONFIG_TARGET_SUN8I=y +CONFIG_MACH_SUN8I=y CONFIG_DEFAULT_DEVICE_TREE="sun8i-a23-ippo-q8h-v5.dtb" diff --git a/configs/Linksprite_pcDuino3_defconfig b/configs/Linksprite_pcDuino3_defconfig index 046ab6f215..935c0555a0 100644 --- a/configs/Linksprite_pcDuino3_defconfig +++ b/configs/Linksprite_pcDuino3_defconfig @@ -3,4 +3,4 @@ CONFIG_SYS_EXTRA_OPTIONS="PCDUINO3,AXP209_POWER,SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GP CONFIG_FDTFILE="sun7i-a20-pcduino3.dtb" +S:CONFIG_ARM=y +S:CONFIG_ARCH_SUNXI=y -+S:CONFIG_TARGET_SUN7I=y ++S:CONFIG_MACH_SUN7I=y diff --git a/configs/Mele_A1000G_defconfig b/configs/Mele_A1000G_defconfig index c0608a540d..17b56126b5 100644 --- a/configs/Mele_A1000G_defconfig +++ b/configs/Mele_A1000G_defconfig @@ -3,4 +3,4 @@ CONFIG_SYS_EXTRA_OPTIONS="MELE_A1000G,AXP209_POWER,SUNXI_EMAC,MACPWR=SUNXI_GPH(1 CONFIG_FDTFILE="sun4i-a10-a1000.dtb" +S:CONFIG_ARM=y +S:CONFIG_ARCH_SUNXI=y -+S:CONFIG_TARGET_SUN4I=y ++S:CONFIG_MACH_SUN4I=y diff --git a/configs/Mele_A1000_defconfig b/configs/Mele_A1000_defconfig index 7623975576..c34f9e2853 100644 --- a/configs/Mele_A1000_defconfig +++ b/configs/Mele_A1000_defconfig @@ -3,4 +3,4 @@ CONFIG_SYS_EXTRA_OPTIONS="MELE_A1000,AXP209_POWER,SUNXI_EMAC,MACPWR=SUNXI_GPH(15 CONFIG_FDTFILE="sun4i-a10-a1000.dtb" +S:CONFIG_ARM=y +S:CONFIG_ARCH_SUNXI=y -+S:CONFIG_TARGET_SUN4I=y ++S:CONFIG_MACH_SUN4I=y diff --git a/configs/Mele_M3_defconfig b/configs/Mele_M3_defconfig index 249344631a..963ae9f2a2 100644 --- a/configs/Mele_M3_defconfig +++ b/configs/Mele_M3_defconfig @@ -5,4 +5,4 @@ CONFIG_FDTFILE="sun7i-a20-m3.dtb" +S:CONFIG_MMC0_CD_PIN="PH1" +S:CONFIG_ARM=y +S:CONFIG_ARCH_SUNXI=y -+S:CONFIG_TARGET_SUN7I=y ++S:CONFIG_MACH_SUN7I=y diff --git a/configs/Mini-X-1Gb_defconfig b/configs/Mini-X-1Gb_defconfig index cd9ac59031..343b53cd7f 100644 --- a/configs/Mini-X-1Gb_defconfig +++ b/configs/Mini-X-1Gb_defconfig @@ -3,4 +3,4 @@ CONFIG_SYS_EXTRA_OPTIONS="MINI_X_1GB,AXP209_POWER,USB_EHCI" CONFIG_FDTFILE="sun4i-a10-mini-xplus.dtb" +S:CONFIG_ARM=y +S:CONFIG_ARCH_SUNXI=y -+S:CONFIG_TARGET_SUN4I=y ++S:CONFIG_MACH_SUN4I=y diff --git a/configs/Mini-X_defconfig b/configs/Mini-X_defconfig index adccb8ba9d..0a1885616a 100644 --- a/configs/Mini-X_defconfig +++ b/configs/Mini-X_defconfig @@ -3,4 +3,4 @@ CONFIG_SYS_EXTRA_OPTIONS="MINI_X,AXP209_POWER,USB_EHCI" CONFIG_FDTFILE="sun4i-a10-mini-xplus.dtb" +S:CONFIG_ARM=y +S:CONFIG_ARCH_SUNXI=y -+S:CONFIG_TARGET_SUN4I=y ++S:CONFIG_MACH_SUN4I=y diff --git a/configs/ba10_tv_box_defconfig b/configs/ba10_tv_box_defconfig index 743a617be8..0a22ddd109 100644 --- a/configs/ba10_tv_box_defconfig +++ b/configs/ba10_tv_box_defconfig @@ -3,4 +3,4 @@ CONFIG_SYS_EXTRA_OPTIONS="BA10_TV_BOX,AXP209_POWER,SUNXI_EMAC,USB_EHCI,SUNXI_USB CONFIG_FDTFILE="sun4i-a10-ba10-tvbox.dtb" +S:CONFIG_ARM=y +S:CONFIG_ARCH_SUNXI=y -+S:CONFIG_TARGET_SUN4I=y ++S:CONFIG_MACH_SUN4I=y diff --git a/configs/i12-tvbox_defconfig b/configs/i12-tvbox_defconfig index e8a9eaf3d8..068c4b5d1a 100644 --- a/configs/i12-tvbox_defconfig +++ b/configs/i12-tvbox_defconfig @@ -3,4 +3,4 @@ CONFIG_SYS_EXTRA_OPTIONS="I12_TVBOX,AXP209_POWER,SUNXI_GMAC,MACPWR=SUNXI_GPH(21) CONFIG_FDTFILE="sun7i-a20-i12-tvbox.dtb" +S:CONFIG_ARM=y +S:CONFIG_ARCH_SUNXI=y -+S:CONFIG_TARGET_SUN7I=y ++S:CONFIG_MACH_SUN7I=y diff --git a/configs/qt840a_defconfig b/configs/qt840a_defconfig index df96eecb98..6ec33a8b16 100644 --- a/configs/qt840a_defconfig +++ b/configs/qt840a_defconfig @@ -3,4 +3,4 @@ CONFIG_SYS_EXTRA_OPTIONS="QT840A,AXP209_POWER,SUNXI_GMAC,MACPWR=SUNXI_GPH(21),US CONFIG_FDTFILE="sun7i-a20-i12-tvbox.dtb" +S:CONFIG_ARM=y +S:CONFIG_ARCH_SUNXI=y -+S:CONFIG_TARGET_SUN7I=y ++S:CONFIG_MACH_SUN7I=y diff --git a/configs/r7-tv-dongle_defconfig b/configs/r7-tv-dongle_defconfig index 6b8dd97e87..2780e14807 100644 --- a/configs/r7-tv-dongle_defconfig +++ b/configs/r7-tv-dongle_defconfig @@ -3,4 +3,4 @@ CONFIG_SYS_EXTRA_OPTIONS="R7DONGLE,AXP152_POWER,USB_EHCI,SUNXI_USB_VBUS0_GPIO=SU CONFIG_FDTFILE="sun5i-a10s-r7-tv-dongle.dtb" +S:CONFIG_ARM=y +S:CONFIG_ARCH_SUNXI=y -+S:CONFIG_TARGET_SUN5I=y ++S:CONFIG_MACH_SUN5I=y |