[U-Boot] [PATCH] sunxi: Use the available Kconfig option for AHCI
Hans de Goede
hdegoede at redhat.com
Sun Nov 13 19:44:28 CET 2016
Hi,
On 31-10-16 21:05, Jelle van der Waa wrote:
> Use the already available Kconfig option for AHCI. Tested on the
> BananaPi.
>
> Signed-off-by: Jelle van der Waa <jelle at vdwaa.nl>
Patch LGTM:
Reviewed-by: Hans de Goede <hdegoede at redhat.com>
Regards,
Hans
> ---
> configs/A10-OLinuXino-Lime_defconfig | 3 ++-
> configs/A20-OLinuXino-Lime2_defconfig | 3 ++-
> configs/A20-OLinuXino-Lime_defconfig | 3 ++-
> configs/A20-OLinuXino_MICRO_defconfig | 3 ++-
> configs/A20-Olimex-SOM-EVB_defconfig | 3 ++-
> configs/Bananapi_defconfig | 3 ++-
> configs/Bananapro_defconfig | 3 ++-
> configs/Cubieboard2_defconfig | 3 ++-
> configs/Cubieboard_defconfig | 3 ++-
> configs/Cubietruck_defconfig | 3 ++-
> configs/Itead_Ibox_A20_defconfig | 3 ++-
> configs/Lamobo_R1_defconfig | 3 ++-
> configs/Linksprite_pcDuino3_Nano_defconfig | 3 ++-
> configs/Linksprite_pcDuino3_defconfig | 3 ++-
> configs/Marsboard_A10_defconfig | 3 ++-
> configs/Mele_A1000_defconfig | 3 ++-
> configs/Mele_M5_defconfig | 3 ++-
> configs/Orangepi_defconfig | 3 ++-
> configs/Orangepi_mini_defconfig | 3 ++-
> configs/Wits_Pro_A20_DKT_defconfig | 3 ++-
> 20 files changed, 40 insertions(+), 20 deletions(-)
>
> diff --git a/configs/A10-OLinuXino-Lime_defconfig b/configs/A10-OLinuXino-Lime_defconfig
> index 04b720d..bb7eaf8 100644
> --- a/configs/A10-OLinuXino-Lime_defconfig
> +++ b/configs/A10-OLinuXino-Lime_defconfig
> @@ -8,7 +8,8 @@ CONFIG_SYS_CLK_FREQ=912000000
> CONFIG_MMC0_CD_PIN="PH1"
> CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-olinuxino-lime"
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> -CONFIG_SYS_EXTRA_OPTIONS="SUNXI_EMAC,AHCI,SATAPWR=SUNXI_GPC(3)"
> +CONFIG_AHCI=y
> +CONFIG_SYS_EXTRA_OPTIONS="SUNXI_EMAC,SATAPWR=SUNXI_GPC(3)"
> CONFIG_SPL=y
> # CONFIG_CMD_IMLS is not set
> # CONFIG_CMD_FLASH is not set
> diff --git a/configs/A20-OLinuXino-Lime2_defconfig b/configs/A20-OLinuXino-Lime2_defconfig
> index 4751fe0..d48e35d 100644
> --- a/configs/A20-OLinuXino-Lime2_defconfig
> +++ b/configs/A20-OLinuXino-Lime2_defconfig
> @@ -8,7 +8,8 @@ CONFIG_USB0_VBUS_PIN="PC17"
> CONFIG_USB0_VBUS_DET="PH5"
> CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-olinuxino-lime2"
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> -CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,RGMII,AHCI,SATAPWR=SUNXI_GPC(3)"
> +CONFIG_AHCI=y
> +CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,RGMII,SATAPWR=SUNXI_GPC(3)"
> CONFIG_SPL=y
> # CONFIG_CMD_IMLS is not set
> # CONFIG_CMD_FLASH is not set
> diff --git a/configs/A20-OLinuXino-Lime_defconfig b/configs/A20-OLinuXino-Lime_defconfig
> index 024dc2d..7c5d84d 100644
> --- a/configs/A20-OLinuXino-Lime_defconfig
> +++ b/configs/A20-OLinuXino-Lime_defconfig
> @@ -6,7 +6,8 @@ CONFIG_DRAM_CLK=384
> CONFIG_MMC0_CD_PIN="PH1"
> CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-olinuxino-lime"
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> -CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPC(3)"
> +CONFIG_AHCI=y
> +CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,SATAPWR=SUNXI_GPC(3)"
> CONFIG_SPL=y
> # CONFIG_CMD_IMLS is not set
> # CONFIG_CMD_FLASH is not set
> diff --git a/configs/A20-OLinuXino_MICRO_defconfig b/configs/A20-OLinuXino_MICRO_defconfig
> index 5809345..9eb5f1b 100644
> --- a/configs/A20-OLinuXino_MICRO_defconfig
> +++ b/configs/A20-OLinuXino_MICRO_defconfig
> @@ -9,7 +9,8 @@ CONFIG_MMC_SUNXI_SLOT_EXTRA=3
> CONFIG_VIDEO_VGA=y
> CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-olinuxino-micro"
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> -CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPB(8)"
> +CONFIG_AHCI=y
> +CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,SATAPWR=SUNXI_GPB(8)"
> CONFIG_SPL=y
> # CONFIG_CMD_IMLS is not set
> # CONFIG_CMD_FLASH is not set
> diff --git a/configs/A20-Olimex-SOM-EVB_defconfig b/configs/A20-Olimex-SOM-EVB_defconfig
> index 7a14a7b..a6bf45f 100644
> --- a/configs/A20-Olimex-SOM-EVB_defconfig
> +++ b/configs/A20-Olimex-SOM-EVB_defconfig
> @@ -11,7 +11,8 @@ CONFIG_USB0_VBUS_PIN="PB9"
> CONFIG_USB0_VBUS_DET="PH5"
> CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-olimex-som-evb"
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> -CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,RGMII,AHCI,SATAPWR=SUNXI_GPC(3)"
> +CONFIG_AHCI=y
> +CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,RGMII,SATAPWR=SUNXI_GPC(3)"
> CONFIG_SPL=y
> # CONFIG_CMD_IMLS is not set
> # CONFIG_CMD_FLASH is not set
> diff --git a/configs/Bananapi_defconfig b/configs/Bananapi_defconfig
> index 366ef24..3da1cf7 100644
> --- a/configs/Bananapi_defconfig
> +++ b/configs/Bananapi_defconfig
> @@ -7,7 +7,8 @@ CONFIG_VIDEO_COMPOSITE=y
> CONFIG_GMAC_TX_DELAY=3
> CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-bananapi"
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> -CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,RGMII,MACPWR=SUNXI_GPH(23),AHCI"
> +CONFIG_AHCI=y
> +CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,RGMII,MACPWR=SUNXI_GPH(23)"
> CONFIG_SPL=y
> # CONFIG_CMD_IMLS is not set
> # CONFIG_CMD_FLASH is not set
> diff --git a/configs/Bananapro_defconfig b/configs/Bananapro_defconfig
> index 9b39124..2b9c865 100644
> --- a/configs/Bananapro_defconfig
> +++ b/configs/Bananapro_defconfig
> @@ -9,7 +9,8 @@ CONFIG_VIDEO_COMPOSITE=y
> CONFIG_GMAC_TX_DELAY=3
> CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-bananapro"
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> -CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,RGMII,MACPWR=SUNXI_GPH(23),AHCI"
> +CONFIG_AHCI=y
> +CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,RGMII,MACPWR=SUNXI_GPH(23)"
> CONFIG_SPL=y
> # CONFIG_CMD_IMLS is not set
> # CONFIG_CMD_FLASH is not set
> diff --git a/configs/Cubieboard2_defconfig b/configs/Cubieboard2_defconfig
> index ad6eb62..9212a17 100644
> --- a/configs/Cubieboard2_defconfig
> +++ b/configs/Cubieboard2_defconfig
> @@ -6,7 +6,8 @@ CONFIG_DRAM_CLK=480
> CONFIG_MMC0_CD_PIN="PH1"
> CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-cubieboard2"
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> -CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPB(8)"
> +CONFIG_AHCI=y
> +CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,SATAPWR=SUNXI_GPB(8)"
> CONFIG_SPL=y
> # CONFIG_CMD_IMLS is not set
> # CONFIG_CMD_FLASH is not set
> diff --git a/configs/Cubieboard_defconfig b/configs/Cubieboard_defconfig
> index 9b4f483..6e7e741 100644
> --- a/configs/Cubieboard_defconfig
> +++ b/configs/Cubieboard_defconfig
> @@ -6,7 +6,8 @@ CONFIG_DRAM_CLK=480
> CONFIG_MMC0_CD_PIN="PH1"
> CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-cubieboard"
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> -CONFIG_SYS_EXTRA_OPTIONS="SUNXI_EMAC,AHCI,SATAPWR=SUNXI_GPB(8)"
> +CONFIG_AHCI=y
> +CONFIG_SYS_EXTRA_OPTIONS="SUNXI_EMAC,SATAPWR=SUNXI_GPB(8)"
> CONFIG_SPL=y
> # CONFIG_CMD_IMLS is not set
> # CONFIG_CMD_FLASH is not set
> diff --git a/configs/Cubietruck_defconfig b/configs/Cubietruck_defconfig
> index 927ccd4..37b60b85 100644
> --- a/configs/Cubietruck_defconfig
> +++ b/configs/Cubietruck_defconfig
> @@ -11,7 +11,8 @@ CONFIG_VIDEO_VGA=y
> CONFIG_GMAC_TX_DELAY=1
> CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-cubietruck"
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> -CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,RGMII,AHCI,SATAPWR=SUNXI_GPH(12)"
> +CONFIG_AHCI=y
> +CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,RGMII,SATAPWR=SUNXI_GPH(12)"
> CONFIG_SPL=y
> # CONFIG_CMD_IMLS is not set
> # CONFIG_CMD_FLASH is not set
> diff --git a/configs/Itead_Ibox_A20_defconfig b/configs/Itead_Ibox_A20_defconfig
> index 1a8fad7..d544d50 100644
> --- a/configs/Itead_Ibox_A20_defconfig
> +++ b/configs/Itead_Ibox_A20_defconfig
> @@ -6,7 +6,8 @@ CONFIG_DRAM_CLK=480
> CONFIG_MMC0_CD_PIN="PH1"
> CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-itead-ibox"
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> -CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPB(8)"
> +CONFIG_AHCI=y
> +CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,SATAPWR=SUNXI_GPB(8)"
> CONFIG_SPL=y
> # CONFIG_CMD_IMLS is not set
> # CONFIG_CMD_FLASH is not set
> diff --git a/configs/Lamobo_R1_defconfig b/configs/Lamobo_R1_defconfig
> index c2fc2b3..58bc5a2 100644
> --- a/configs/Lamobo_R1_defconfig
> +++ b/configs/Lamobo_R1_defconfig
> @@ -7,7 +7,8 @@ CONFIG_MMC0_CD_PIN="PH10"
> CONFIG_GMAC_TX_DELAY=4
> CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-lamobo-r1"
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> -CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,RGMII,MACPWR=SUNXI_GPH(23),AHCI,SATAPWR=SUNXI_GPB(3)"
> +CONFIG_AHCI=y
> +CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,RGMII,MACPWR=SUNXI_GPH(23),SATAPWR=SUNXI_GPB(3)"
> CONFIG_SPL=y
> # CONFIG_CMD_IMLS is not set
> # CONFIG_CMD_FLASH is not set
> diff --git a/configs/Linksprite_pcDuino3_Nano_defconfig b/configs/Linksprite_pcDuino3_Nano_defconfig
> index a916e5d..8cbe9c3 100644
> --- a/configs/Linksprite_pcDuino3_Nano_defconfig
> +++ b/configs/Linksprite_pcDuino3_Nano_defconfig
> @@ -8,7 +8,8 @@ CONFIG_USB1_VBUS_PIN="PH11"
> CONFIG_GMAC_TX_DELAY=3
> CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-pcduino3-nano"
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> -CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,RGMII,AHCI,SATAPWR=SUNXI_GPH(2)"
> +CONFIG_AHCI=y
> +CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,RGMII,SATAPWR=SUNXI_GPH(2)"
> CONFIG_SPL=y
> # CONFIG_CMD_IMLS is not set
> # CONFIG_CMD_FLASH is not set
> diff --git a/configs/Linksprite_pcDuino3_defconfig b/configs/Linksprite_pcDuino3_defconfig
> index 8eea214..5d155b4 100644
> --- a/configs/Linksprite_pcDuino3_defconfig
> +++ b/configs/Linksprite_pcDuino3_defconfig
> @@ -6,7 +6,8 @@ CONFIG_DRAM_CLK=480
> CONFIG_DRAM_ZQ=122
> CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-pcduino3"
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> -CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPH(2)"
> +CONFIG_AHCI=y
> +CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,SATAPWR=SUNXI_GPH(2)"
> CONFIG_SPL=y
> # CONFIG_CMD_IMLS is not set
> # CONFIG_CMD_FLASH is not set
> diff --git a/configs/Marsboard_A10_defconfig b/configs/Marsboard_A10_defconfig
> index b1d6b23..6a88238 100644
> --- a/configs/Marsboard_A10_defconfig
> +++ b/configs/Marsboard_A10_defconfig
> @@ -3,7 +3,8 @@ CONFIG_ARCH_SUNXI=y
> CONFIG_MACH_SUN4I=y
> CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-marsboard"
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> -CONFIG_SYS_EXTRA_OPTIONS="SUNXI_EMAC,AHCI"
> +CONFIG_AHCI=y
> +CONFIG_SYS_EXTRA_OPTIONS="SUNXI_EMAC"
> CONFIG_SPL=y
> # CONFIG_CMD_IMLS is not set
> # CONFIG_CMD_FLASH is not set
> diff --git a/configs/Mele_A1000_defconfig b/configs/Mele_A1000_defconfig
> index eae5ead..d678ffb 100644
> --- a/configs/Mele_A1000_defconfig
> +++ b/configs/Mele_A1000_defconfig
> @@ -6,7 +6,8 @@ CONFIG_VIDEO_VGA=y
> CONFIG_VIDEO_COMPOSITE=y
> CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-a1000"
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> -CONFIG_SYS_EXTRA_OPTIONS="SUNXI_EMAC,MACPWR=SUNXI_GPH(15),AHCI"
> +CONFIG_AHCI=y
> +CONFIG_SYS_EXTRA_OPTIONS="SUNXI_EMAC,MACPWR=SUNXI_GPH(15)"
> CONFIG_SPL=y
> # CONFIG_CMD_IMLS is not set
> # CONFIG_CMD_FLASH is not set
> diff --git a/configs/Mele_M5_defconfig b/configs/Mele_M5_defconfig
> index 124dc22..fffc332 100644
> --- a/configs/Mele_M5_defconfig
> +++ b/configs/Mele_M5_defconfig
> @@ -8,7 +8,8 @@ CONFIG_MMC0_CD_PIN="PH1"
> CONFIG_VIDEO_COMPOSITE=y
> CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-m5"
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> -CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,AHCI,STATUSLED=234"
> +CONFIG_AHCI=y
> +CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,STATUSLED=234"
> CONFIG_SPL=y
> # CONFIG_CMD_IMLS is not set
> # CONFIG_CMD_FLASH is not set
> diff --git a/configs/Orangepi_defconfig b/configs/Orangepi_defconfig
> index c3eaae2..052ca83 100644
> --- a/configs/Orangepi_defconfig
> +++ b/configs/Orangepi_defconfig
> @@ -10,7 +10,8 @@ CONFIG_VIDEO_COMPOSITE=y
> CONFIG_GMAC_TX_DELAY=3
> CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-orangepi"
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> -CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,RGMII,MACPWR=SUNXI_GPH(23),AHCI"
> +CONFIG_AHCI=y
> +CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,RGMII,MACPWR=SUNXI_GPH(23)"
> CONFIG_SPL=y
> # CONFIG_CMD_IMLS is not set
> # CONFIG_CMD_FLASH is not set
> diff --git a/configs/Orangepi_mini_defconfig b/configs/Orangepi_mini_defconfig
> index 2903d83..63db70d 100644
> --- a/configs/Orangepi_mini_defconfig
> +++ b/configs/Orangepi_mini_defconfig
> @@ -12,7 +12,8 @@ CONFIG_VIDEO_COMPOSITE=y
> CONFIG_GMAC_TX_DELAY=3
> CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-orangepi-mini"
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> -CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,RGMII,MACPWR=SUNXI_GPH(23),AHCI"
> +CONFIG_AHCI=y
> +CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,RGMII,MACPWR=SUNXI_GPH(23)"
> CONFIG_SPL=y
> # CONFIG_CMD_IMLS is not set
> # CONFIG_CMD_FLASH is not set
> diff --git a/configs/Wits_Pro_A20_DKT_defconfig b/configs/Wits_Pro_A20_DKT_defconfig
> index d83cee7..d847fc7 100644
> --- a/configs/Wits_Pro_A20_DKT_defconfig
> +++ b/configs/Wits_Pro_A20_DKT_defconfig
> @@ -11,7 +11,8 @@ CONFIG_VIDEO_LCD_BL_PWM="PB2"
> CONFIG_VIDEO_LCD_PANEL_LVDS=y
> CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-wits-pro-a20-dkt"
> # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
> -CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,RGMII,AHCI"
> +CONFIG_AHCI=y
> +CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,RGMII"
> CONFIG_SPL=y
> # CONFIG_CMD_IMLS is not set
> # CONFIG_CMD_FLASH is not set
>
More information about the U-Boot
mailing list