* [U-Boot] [PATCH 6/9] ARM: mvebu: add support for boot from SATA [not found] <cover.1557997586.git.baruch@tkos.co.il> @ 2019-05-16 10:03 ` Baruch Siach 2019-05-16 10:11 ` Baruch Siach 2019-05-16 10:04 ` [U-Boot] [PATCH 7/9] ARM: dts: clearfog: enable SATA in SPL Baruch Siach 1 sibling, 1 reply; 5+ messages in thread From: Baruch Siach @ 2019-05-16 10:03 UTC (permalink / raw) To: u-boot Add the required Kconfig and macro definitions to allow boot from SATA on Armada 38x systems. Signed-off-by: Baruch Siach <baruch@tkos.co.il> --- arch/arm/mach-mvebu/Kconfig | 5 +++++ arch/arm/mach-mvebu/Makefile | 3 +++ arch/arm/mach-mvebu/include/mach/soc.h | 2 ++ arch/arm/mach-mvebu/spl.c | 5 +++++ 4 files changed, 15 insertions(+) diff --git a/arch/arm/mach-mvebu/Kconfig b/arch/arm/mach-mvebu/Kconfig index 495c48e6c749..fdd39685b75d 100644 --- a/arch/arm/mach-mvebu/Kconfig +++ b/arch/arm/mach-mvebu/Kconfig @@ -239,6 +239,11 @@ config MVEBU_SPL_BOOT_DEVICE_MMC bool "SDIO/MMC card" select SPL_LIBDISK_SUPPORT +config MVEBU_SPL_BOOT_DEVICE_SATA + bool "SATA" + select SPL_SATA_SUPPORT + select SPL_LIBDISK_SUPPORT + config MVEBU_SPL_BOOT_DEVICE_UART bool "UART" diff --git a/arch/arm/mach-mvebu/Makefile b/arch/arm/mach-mvebu/Makefile index 02d3ce27ee74..8228a17972f9 100644 --- a/arch/arm/mach-mvebu/Makefile +++ b/arch/arm/mach-mvebu/Makefile @@ -37,6 +37,9 @@ endif ifneq ($(CONFIG_MVEBU_SPL_BOOT_DEVICE_MMC),) KWB_CFG_BOOT_FROM=sdio endif +ifneq ($(CONFIG_MVEBU_SPL_BOOT_DEVICE_SATA),) + KWB_CFG_BOOT_FROM=sata +endif ifneq ($(CONFIG_MVEBU_SPL_BOOT_DEVICE_UART),) KWB_CFG_BOOT_FROM=uart endif diff --git a/arch/arm/mach-mvebu/include/mach/soc.h b/arch/arm/mach-mvebu/include/mach/soc.h index f666ee24243b..acb9257c90fe 100644 --- a/arch/arm/mach-mvebu/include/mach/soc.h +++ b/arch/arm/mach-mvebu/include/mach/soc.h @@ -159,7 +159,9 @@ #define BOOT_DEV_SEL_MASK (0x3f << BOOT_DEV_SEL_OFFS) #define BOOT_FROM_NAND 0x0A +#define BOOT_FROM_SATA 0x22 #define BOOT_FROM_UART 0x28 +#define BOOT_FROM_SATA_ALT 0x2A #define BOOT_FROM_UART_ALT 0x3f #define BOOT_FROM_SPI 0x32 #define BOOT_FROM_MMC 0x30 diff --git a/arch/arm/mach-mvebu/spl.c b/arch/arm/mach-mvebu/spl.c index 530b98c1aa31..d54de5195624 100644 --- a/arch/arm/mach-mvebu/spl.c +++ b/arch/arm/mach-mvebu/spl.c @@ -59,6 +59,11 @@ static u32 get_boot_device(void) case BOOT_FROM_UART_ALT: #endif return BOOT_DEVICE_UART; +#ifdef BOOT_FROM_SATA + case BOOT_FROM_SATA: + case BOOT_FROM_SATA_ALT: + return BOOT_DEVICE_SATA; +#endif case BOOT_FROM_SPI: default: return BOOT_DEVICE_SPI; -- 2.20.1 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* [U-Boot] [PATCH 6/9] ARM: mvebu: add support for boot from SATA 2019-05-16 10:03 ` [U-Boot] [PATCH 6/9] ARM: mvebu: add support for boot from SATA Baruch Siach @ 2019-05-16 10:11 ` Baruch Siach 0 siblings, 0 replies; 5+ messages in thread From: Baruch Siach @ 2019-05-16 10:11 UTC (permalink / raw) To: u-boot Hi u-boot list, Stefan, Please ignore this patch and the next. The patch series starts at the 0/9 cover letter. Sorry for the spam. baruch On Thu, May 16 2019, Baruch Siach wrote: > Add the required Kconfig and macro definitions to allow boot from SATA > on Armada 38x systems. > > Signed-off-by: Baruch Siach <baruch@tkos.co.il> > --- > arch/arm/mach-mvebu/Kconfig | 5 +++++ > arch/arm/mach-mvebu/Makefile | 3 +++ > arch/arm/mach-mvebu/include/mach/soc.h | 2 ++ > arch/arm/mach-mvebu/spl.c | 5 +++++ > 4 files changed, 15 insertions(+) > > diff --git a/arch/arm/mach-mvebu/Kconfig b/arch/arm/mach-mvebu/Kconfig > index 495c48e6c749..fdd39685b75d 100644 > --- a/arch/arm/mach-mvebu/Kconfig > +++ b/arch/arm/mach-mvebu/Kconfig > @@ -239,6 +239,11 @@ config MVEBU_SPL_BOOT_DEVICE_MMC > bool "SDIO/MMC card" > select SPL_LIBDISK_SUPPORT > > +config MVEBU_SPL_BOOT_DEVICE_SATA > + bool "SATA" > + select SPL_SATA_SUPPORT > + select SPL_LIBDISK_SUPPORT > + > config MVEBU_SPL_BOOT_DEVICE_UART > bool "UART" > > diff --git a/arch/arm/mach-mvebu/Makefile b/arch/arm/mach-mvebu/Makefile > index 02d3ce27ee74..8228a17972f9 100644 > --- a/arch/arm/mach-mvebu/Makefile > +++ b/arch/arm/mach-mvebu/Makefile > @@ -37,6 +37,9 @@ endif > ifneq ($(CONFIG_MVEBU_SPL_BOOT_DEVICE_MMC),) > KWB_CFG_BOOT_FROM=sdio > endif > +ifneq ($(CONFIG_MVEBU_SPL_BOOT_DEVICE_SATA),) > + KWB_CFG_BOOT_FROM=sata > +endif > ifneq ($(CONFIG_MVEBU_SPL_BOOT_DEVICE_UART),) > KWB_CFG_BOOT_FROM=uart > endif > diff --git a/arch/arm/mach-mvebu/include/mach/soc.h b/arch/arm/mach-mvebu/include/mach/soc.h > index f666ee24243b..acb9257c90fe 100644 > --- a/arch/arm/mach-mvebu/include/mach/soc.h > +++ b/arch/arm/mach-mvebu/include/mach/soc.h > @@ -159,7 +159,9 @@ > #define BOOT_DEV_SEL_MASK (0x3f << BOOT_DEV_SEL_OFFS) > > #define BOOT_FROM_NAND 0x0A > +#define BOOT_FROM_SATA 0x22 > #define BOOT_FROM_UART 0x28 > +#define BOOT_FROM_SATA_ALT 0x2A > #define BOOT_FROM_UART_ALT 0x3f > #define BOOT_FROM_SPI 0x32 > #define BOOT_FROM_MMC 0x30 > diff --git a/arch/arm/mach-mvebu/spl.c b/arch/arm/mach-mvebu/spl.c > index 530b98c1aa31..d54de5195624 100644 > --- a/arch/arm/mach-mvebu/spl.c > +++ b/arch/arm/mach-mvebu/spl.c > @@ -59,6 +59,11 @@ static u32 get_boot_device(void) > case BOOT_FROM_UART_ALT: > #endif > return BOOT_DEVICE_UART; > +#ifdef BOOT_FROM_SATA > + case BOOT_FROM_SATA: > + case BOOT_FROM_SATA_ALT: > + return BOOT_DEVICE_SATA; > +#endif > case BOOT_FROM_SPI: > default: > return BOOT_DEVICE_SPI; -- http://baruch.siach.name/blog/ ~. .~ Tk Open Systems =}------------------------------------------------ooO--U--Ooo------------{= - baruch at tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il - ^ permalink raw reply [flat|nested] 5+ messages in thread
* [U-Boot] [PATCH 7/9] ARM: dts: clearfog: enable SATA in SPL [not found] <cover.1557997586.git.baruch@tkos.co.il> 2019-05-16 10:03 ` [U-Boot] [PATCH 6/9] ARM: mvebu: add support for boot from SATA Baruch Siach @ 2019-05-16 10:04 ` Baruch Siach 1 sibling, 0 replies; 5+ messages in thread From: Baruch Siach @ 2019-05-16 10:04 UTC (permalink / raw) To: u-boot Enable SATA peripherals in SPL to allow boot from SATA. Signed-off-by: Baruch Siach <baruch@tkos.co.il> --- arch/arm/dts/armada-388-clearfog-u-boot.dtsi | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/arch/arm/dts/armada-388-clearfog-u-boot.dtsi b/arch/arm/dts/armada-388-clearfog-u-boot.dtsi index a12694e17103..cf6c08881b18 100644 --- a/arch/arm/dts/armada-388-clearfog-u-boot.dtsi +++ b/arch/arm/dts/armada-388-clearfog-u-boot.dtsi @@ -11,3 +11,11 @@ &sdhci { u-boot,dm-spl; }; + +&ahci0 { + u-boot,dm-spl; +}; + +&ahci1 { + u-boot,dm-spl; +}; -- 2.20.1 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* [U-Boot] [PATCH 0/9] arm: mvebu: clearfog: support boot from SATA disk @ 2019-05-16 10:03 Baruch Siach 2019-05-16 10:03 ` [U-Boot] [PATCH 6/9] arm: mvebu: add support for boot from SATA Baruch Siach 0 siblings, 1 reply; 5+ messages in thread From: Baruch Siach @ 2019-05-16 10:03 UTC (permalink / raw) To: u-boot This series enables support for boot from SATA on the SolidRun Clearfog platform. Patches 1-3 are preparations for the addition of loading U-Boot main image from raw SATA device. They make spl sata code independent of board macros and specific kconfig symbols. Patch 4 adds to SPL generic support for loading U-Boot from a raw SATA device. This code is modeled after the similar support for MMC devices. Patches 5-6 are mvebu specific. Patch 5 fixes SATA access from SPL. Patch 6 adds the SATA boot option at the SoC level. Patches 7-9 are the board specific update that enable SATA boot in Clearfog, and document the offset setting requirement. Baruch Siach (9): spl: sata: add default partition and image name spl: sata: fix build with DM_SCSI spl: sata: don't force FS_FAT support spl: sata: support U-Boot load from raw sata disk arm: mvebu: fix ahci mbus config in SPL arm: mvebu: add support for boot from SATA arm: mvebu: clearfog: enable SATA in SPL arm: mvebu: clearfog: set U-Boot offset for SATA boot arm: mvebu: clearfog: document boot from SATA arch/arm/dts/armada-388-clearfog-u-boot.dtsi | 8 ++++ arch/arm/mach-mvebu/Kconfig | 5 ++ arch/arm/mach-mvebu/Makefile | 3 ++ arch/arm/mach-mvebu/cpu.c | 4 ++ arch/arm/mach-mvebu/include/mach/soc.h | 2 + arch/arm/mach-mvebu/spl.c | 5 ++ board/solidrun/clearfog/README | 6 +++ common/spl/Kconfig | 14 ++++++ common/spl/spl_sata.c | 49 ++++++++++++++++++-- include/configs/clearfog.h | 2 +- 10 files changed, 94 insertions(+), 4 deletions(-) -- 2.20.1 ^ permalink raw reply [flat|nested] 5+ messages in thread
* [U-Boot] [PATCH 6/9] arm: mvebu: add support for boot from SATA 2019-05-16 10:03 [U-Boot] [PATCH 0/9] arm: mvebu: clearfog: support boot from SATA disk Baruch Siach @ 2019-05-16 10:03 ` Baruch Siach 2019-05-17 7:58 ` Chris Packham 0 siblings, 1 reply; 5+ messages in thread From: Baruch Siach @ 2019-05-16 10:03 UTC (permalink / raw) To: u-boot Add the required Kconfig and macro definitions to allow boot from SATA on Armada 38x systems. Signed-off-by: Baruch Siach <baruch@tkos.co.il> --- arch/arm/mach-mvebu/Kconfig | 5 +++++ arch/arm/mach-mvebu/Makefile | 3 +++ arch/arm/mach-mvebu/include/mach/soc.h | 2 ++ arch/arm/mach-mvebu/spl.c | 5 +++++ 4 files changed, 15 insertions(+) diff --git a/arch/arm/mach-mvebu/Kconfig b/arch/arm/mach-mvebu/Kconfig index 495c48e6c749..fdd39685b75d 100644 --- a/arch/arm/mach-mvebu/Kconfig +++ b/arch/arm/mach-mvebu/Kconfig @@ -239,6 +239,11 @@ config MVEBU_SPL_BOOT_DEVICE_MMC bool "SDIO/MMC card" select SPL_LIBDISK_SUPPORT +config MVEBU_SPL_BOOT_DEVICE_SATA + bool "SATA" + select SPL_SATA_SUPPORT + select SPL_LIBDISK_SUPPORT + config MVEBU_SPL_BOOT_DEVICE_UART bool "UART" diff --git a/arch/arm/mach-mvebu/Makefile b/arch/arm/mach-mvebu/Makefile index 02d3ce27ee74..8228a17972f9 100644 --- a/arch/arm/mach-mvebu/Makefile +++ b/arch/arm/mach-mvebu/Makefile @@ -37,6 +37,9 @@ endif ifneq ($(CONFIG_MVEBU_SPL_BOOT_DEVICE_MMC),) KWB_CFG_BOOT_FROM=sdio endif +ifneq ($(CONFIG_MVEBU_SPL_BOOT_DEVICE_SATA),) + KWB_CFG_BOOT_FROM=sata +endif ifneq ($(CONFIG_MVEBU_SPL_BOOT_DEVICE_UART),) KWB_CFG_BOOT_FROM=uart endif diff --git a/arch/arm/mach-mvebu/include/mach/soc.h b/arch/arm/mach-mvebu/include/mach/soc.h index f666ee24243b..acb9257c90fe 100644 --- a/arch/arm/mach-mvebu/include/mach/soc.h +++ b/arch/arm/mach-mvebu/include/mach/soc.h @@ -159,7 +159,9 @@ #define BOOT_DEV_SEL_MASK (0x3f << BOOT_DEV_SEL_OFFS) #define BOOT_FROM_NAND 0x0A +#define BOOT_FROM_SATA 0x22 #define BOOT_FROM_UART 0x28 +#define BOOT_FROM_SATA_ALT 0x2A #define BOOT_FROM_UART_ALT 0x3f #define BOOT_FROM_SPI 0x32 #define BOOT_FROM_MMC 0x30 diff --git a/arch/arm/mach-mvebu/spl.c b/arch/arm/mach-mvebu/spl.c index 530b98c1aa31..d54de5195624 100644 --- a/arch/arm/mach-mvebu/spl.c +++ b/arch/arm/mach-mvebu/spl.c @@ -59,6 +59,11 @@ static u32 get_boot_device(void) case BOOT_FROM_UART_ALT: #endif return BOOT_DEVICE_UART; +#ifdef BOOT_FROM_SATA + case BOOT_FROM_SATA: + case BOOT_FROM_SATA_ALT: + return BOOT_DEVICE_SATA; +#endif case BOOT_FROM_SPI: default: return BOOT_DEVICE_SPI; -- 2.20.1 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* [U-Boot] [PATCH 6/9] arm: mvebu: add support for boot from SATA 2019-05-16 10:03 ` [U-Boot] [PATCH 6/9] arm: mvebu: add support for boot from SATA Baruch Siach @ 2019-05-17 7:58 ` Chris Packham 0 siblings, 0 replies; 5+ messages in thread From: Chris Packham @ 2019-05-17 7:58 UTC (permalink / raw) To: u-boot On Thu, May 16, 2019 at 10:09 PM Baruch Siach <baruch@tkos.co.il> wrote: > > Add the required Kconfig and macro definitions to allow boot from SATA > on Armada 38x systems. > > Signed-off-by: Baruch Siach <baruch@tkos.co.il> Reviewed-by: Chris Packham <judge.packham@gmail.com> > --- > arch/arm/mach-mvebu/Kconfig | 5 +++++ > arch/arm/mach-mvebu/Makefile | 3 +++ > arch/arm/mach-mvebu/include/mach/soc.h | 2 ++ > arch/arm/mach-mvebu/spl.c | 5 +++++ > 4 files changed, 15 insertions(+) > > diff --git a/arch/arm/mach-mvebu/Kconfig b/arch/arm/mach-mvebu/Kconfig > index 495c48e6c749..fdd39685b75d 100644 > --- a/arch/arm/mach-mvebu/Kconfig > +++ b/arch/arm/mach-mvebu/Kconfig > @@ -239,6 +239,11 @@ config MVEBU_SPL_BOOT_DEVICE_MMC > bool "SDIO/MMC card" > select SPL_LIBDISK_SUPPORT > > +config MVEBU_SPL_BOOT_DEVICE_SATA > + bool "SATA" > + select SPL_SATA_SUPPORT > + select SPL_LIBDISK_SUPPORT > + > config MVEBU_SPL_BOOT_DEVICE_UART > bool "UART" > > diff --git a/arch/arm/mach-mvebu/Makefile b/arch/arm/mach-mvebu/Makefile > index 02d3ce27ee74..8228a17972f9 100644 > --- a/arch/arm/mach-mvebu/Makefile > +++ b/arch/arm/mach-mvebu/Makefile > @@ -37,6 +37,9 @@ endif > ifneq ($(CONFIG_MVEBU_SPL_BOOT_DEVICE_MMC),) > KWB_CFG_BOOT_FROM=sdio > endif > +ifneq ($(CONFIG_MVEBU_SPL_BOOT_DEVICE_SATA),) > + KWB_CFG_BOOT_FROM=sata > +endif > ifneq ($(CONFIG_MVEBU_SPL_BOOT_DEVICE_UART),) > KWB_CFG_BOOT_FROM=uart > endif > diff --git a/arch/arm/mach-mvebu/include/mach/soc.h b/arch/arm/mach-mvebu/include/mach/soc.h > index f666ee24243b..acb9257c90fe 100644 > --- a/arch/arm/mach-mvebu/include/mach/soc.h > +++ b/arch/arm/mach-mvebu/include/mach/soc.h > @@ -159,7 +159,9 @@ > #define BOOT_DEV_SEL_MASK (0x3f << BOOT_DEV_SEL_OFFS) > > #define BOOT_FROM_NAND 0x0A > +#define BOOT_FROM_SATA 0x22 > #define BOOT_FROM_UART 0x28 > +#define BOOT_FROM_SATA_ALT 0x2A > #define BOOT_FROM_UART_ALT 0x3f > #define BOOT_FROM_SPI 0x32 > #define BOOT_FROM_MMC 0x30 > diff --git a/arch/arm/mach-mvebu/spl.c b/arch/arm/mach-mvebu/spl.c > index 530b98c1aa31..d54de5195624 100644 > --- a/arch/arm/mach-mvebu/spl.c > +++ b/arch/arm/mach-mvebu/spl.c > @@ -59,6 +59,11 @@ static u32 get_boot_device(void) > case BOOT_FROM_UART_ALT: > #endif > return BOOT_DEVICE_UART; > +#ifdef BOOT_FROM_SATA > + case BOOT_FROM_SATA: > + case BOOT_FROM_SATA_ALT: > + return BOOT_DEVICE_SATA; > +#endif > case BOOT_FROM_SPI: > default: > return BOOT_DEVICE_SPI; > -- > 2.20.1 > > _______________________________________________ > U-Boot mailing list > U-Boot at lists.denx.de > https://lists.denx.de/listinfo/u-boot ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2019-05-17 7:58 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <cover.1557997586.git.baruch@tkos.co.il>
2019-05-16 10:03 ` [U-Boot] [PATCH 6/9] ARM: mvebu: add support for boot from SATA Baruch Siach
2019-05-16 10:11 ` Baruch Siach
2019-05-16 10:04 ` [U-Boot] [PATCH 7/9] ARM: dts: clearfog: enable SATA in SPL Baruch Siach
2019-05-16 10:03 [U-Boot] [PATCH 0/9] arm: mvebu: clearfog: support boot from SATA disk Baruch Siach
2019-05-16 10:03 ` [U-Boot] [PATCH 6/9] arm: mvebu: add support for boot from SATA Baruch Siach
2019-05-17 7:58 ` Chris Packham
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox