| Message ID | 1456478426-27197-2-git-send-email-wenyou.yang@atmel.com |
|---|---|
| State | Accepted |
| Commit | cc434ad5c1c97baa9d7020db35f74a4998f2146a |
| Delegated to: | Andreas Bießmann |
| Headers | show |
On Fri, Feb 26, 2016 at 05:20:25PM +0800, Wenyou Yang wrote: > They will be used on SAMA5D2 PTC board. > > Signed-off-by: Wenyou Yang <wenyou.yang@atmel.com> Reviewed-by: Andreas Bießmann <andreas@biessmann.org> > --- > > arch/arm/mach-at91/include/mach/sama5_sfr.h | 24 ++++++++++++++++++++++++ > arch/arm/mach-at91/include/mach/sama5d2.h | 5 +++++ > 2 files changed, 29 insertions(+)
Dear Wenyou Yang, Wenyou Yang <wenyou.yang@atmel.com> writes: >They will be used on SAMA5D2 PTC board. > >Signed-off-by: Wenyou Yang <wenyou.yang@atmel.com> >Reviewed-by: Andreas Bießmann <andreas@biessmann.org> >--- > > arch/arm/mach-at91/include/mach/sama5_sfr.h | 24 ++++++++++++++++++++++++ > arch/arm/mach-at91/include/mach/sama5d2.h | 5 +++++ > 2 files changed, 29 insertions(+) applied to u-boot-atmel/master, thanks! Best regards, Andreas Bießmann
Dear Wenyou Yang, Wenyou Yang <wenyou.yang@atmel.com> writes: >The board supports following features: > - Boot media support: NAND Flash/SPI Flash > - Support ethernet > - Support USB mass storage > >Signed-off-by: Wenyou Yang <wenyou.yang@atmel.com> >Reviewed-by: Andreas Bießmann <andreas@biessmann.org> >--- > > arch/arm/mach-at91/Kconfig | 6 + > board/atmel/sama5d2_ptc/Kconfig | 15 ++ > board/atmel/sama5d2_ptc/MAINTAINERS | 7 + > board/atmel/sama5d2_ptc/Makefile | 8 + > board/atmel/sama5d2_ptc/sama5d2_ptc.c | 285 +++++++++++++++++++++++++++++++ > configs/sama5d2_ptc_nandflash_defconfig | 12 ++ > configs/sama5d2_ptc_spiflash_defconfig | 12 ++ > include/configs/sama5d2_ptc.h | 155 +++++++++++++++++ > 8 files changed, 500 insertions(+) > create mode 100644 board/atmel/sama5d2_ptc/Kconfig > create mode 100644 board/atmel/sama5d2_ptc/MAINTAINERS > create mode 100644 board/atmel/sama5d2_ptc/Makefile > create mode 100644 board/atmel/sama5d2_ptc/sama5d2_ptc.c > create mode 100644 configs/sama5d2_ptc_nandflash_defconfig > create mode 100644 configs/sama5d2_ptc_spiflash_defconfig > create mode 100644 include/configs/sama5d2_ptc.h applied to u-boot-atmel/master, thanks! Best regards, Andreas Bießmann
Dear Wenyou Yang, Wenyou Yang <wenyou.yang@atmel.com> writes: >Fix the missing pin config of the SDMMC0 interface. > >Signed-off-by: Wenyou Yang <wenyou.yang@atmel.com> >Reviewed-by: Andreas Bießmann <andreas@biessmann.org> >--- > > board/atmel/sama5d2_xplained/sama5d2_xplained.c | 1 + > 1 file changed, 1 insertion(+) applied to u-boot-atmel/master, thanks! Best regards, Andreas Bießmann
Dear Wenyou Yang, Wenyou Yang <wenyou.yang@atmel.com> writes: >Before enabling a generated clock whose source is from the UPLL >clock, check and enable the UPLL clock. > >Signed-off-by: Wenyou Yang <wenyou.yang@atmel.com> >Reviewed-by: Andreas Bießmann <andreas@biessmann.org> >--- > > arch/arm/mach-at91/armv7/clock.c | 5 +++++ > 1 file changed, 5 insertions(+) applied to u-boot-atmel/master, thanks! Best regards, Andreas Bießmann
Dear Wenyou Yang, Wenyou Yang <wenyou.yang@atmel.com> writes: >Add the UPLL clock and master clock as a clock source for getting >the generated clock frequency to complete its clock sources support. > >Signed-off-by: Wenyou Yang <wenyou.yang@atmel.com> >Reviewed-by: Andreas Bießmann <andreas@biessmann.org> >--- > > arch/arm/mach-at91/armv7/clock.c | 6 ++++++ > arch/arm/mach-at91/include/mach/clk.h | 2 ++ > 2 files changed, 8 insertions(+) applied to u-boot-atmel/master, thanks! Best regards, Andreas Bießmann
Dear Marek Vasut, Marek Vasut <marex@denx.de> writes: >Enable the fitImage support for the entire SAMA5Dx lineup of CPUs. >The fitImage is superior image format to uImage and it is useful >to have it available. > >Signed-off-by: Marek Vasut <marex@denx.de> >Cc: Andreas Bießmann <andreas.devel@googlemail.com> >Cc: Wenyou Yang <wenyou.yang@atmel.com> >Reviewed-by: Andreas Bießmann <andreas@biessmann.org> >[rebase on current ToT] >Signed-off-by: Andreas Bießmann <andreas@biessmann.org> >--- > configs/sama5d2_xplained_mmc_defconfig | 1 + > configs/sama5d2_xplained_spiflash_defconfig | 1 + > configs/sama5d3_xplained_mmc_defconfig | 1 + > configs/sama5d3_xplained_nandflash_defconfig | 1 + > configs/sama5d3xek_mmc_defconfig | 1 + > configs/sama5d3xek_nandflash_defconfig | 1 + > configs/sama5d3xek_spiflash_defconfig | 1 + > configs/sama5d4_xplained_mmc_defconfig | 1 + > configs/sama5d4_xplained_nandflash_defconfig | 1 + > configs/sama5d4_xplained_spiflash_defconfig | 1 + > configs/sama5d4ek_mmc_defconfig | 1 + > configs/sama5d4ek_nandflash_defconfig | 1 + > configs/sama5d4ek_spiflash_defconfig | 1 + > 13 files changed, 13 insertions(+) applied to u-boot-atmel/master, thanks! Best regards, Andreas Bießmann
Dear Marek Vasut, Marek Vasut <marex@denx.de> writes: >Implement support for saving ARM register R4 early during boot using >save_boot_params . Implement support for decoding the stored register >R4 value in spl_boot_device() to obtain boot device from which the >SoC booted. This way, the SPL will always load U-Boot from the same >device from which the SPL itself booted instead of using hard-coded >boot device. > >This functionality is useful for example when booting sama5d2-xplained >from SD card, where by default the SPL would try loading the U-Boot >from eMMC and fail. This is because eMMC is on SDHCI0 (BOOT_DEVICE_MMC1), >while SD slot is on SDHCI1 (BOOT_DEVICE_MMC2) and the SPL was hard-wired >to always boot from BOOT_DEVICE_MMC1. > >Signed-off-by: Marek Vasut <marex@denx.de> >Cc: Andreas Bießmann <andreas.devel@googlemail.com> >Cc: Wenyou Yang <wenyou.yang@atmel.com> >Reviewed-by: Andreas Bießmann <andreas@biessmann.org> >--- > arch/arm/mach-at91/Makefile | 2 +- > arch/arm/mach-at91/bootparams_atmel.S | 18 ++++++++++++++++ > arch/arm/mach-at91/include/mach/sama5d2.h | 12 +++++++++++ > arch/arm/mach-at91/spl.c | 36 +++++++++++++++++++++++++++++++ > 4 files changed, 67 insertions(+), 1 deletion(-) > create mode 100644 arch/arm/mach-at91/bootparams_atmel.S applied to u-boot-atmel/master, thanks! Best regards, Andreas Bießmann
diff --git a/arch/arm/mach-at91/include/mach/sama5_sfr.h b/arch/arm/mach-at91/include/mach/sama5_sfr.h index b040256..b805a2c 100644 --- a/arch/arm/mach-at91/include/mach/sama5_sfr.h +++ b/arch/arm/mach-at91/include/mach/sama5_sfr.h @@ -32,6 +32,30 @@ struct atmel_sfr { #define ATMEL_SFR_DDRCFG_FDQIEN 0x00010000 #define ATMEL_SFR_DDRCFG_FDQSIEN 0x00020000 +/* Bit field in EBICFG */ +#define AT91_SFR_EBICFG_DRIVE0 (0x3 << 0) +#define AT91_SFR_EBICFG_DRIVE0_LOW (0x0 << 0) +#define AT91_SFR_EBICFG_DRIVE0_MEDIUM (0x2 << 0) +#define AT91_SFR_EBICFG_DRIVE0_HIGH (0x3 << 0) +#define AT91_SFR_EBICFG_PULL0 (0x3 << 2) +#define AT91_SFR_EBICFG_PULL0_UP (0x0 << 2) +#define AT91_SFR_EBICFG_PULL0_NONE (0x1 << 2) +#define AT91_SFR_EBICFG_PULL0_DOWN (0x3 << 2) +#define AT91_SFR_EBICFG_SCH0 (0x1 << 4) +#define AT91_SFR_EBICFG_SCH0_OFF (0x0 << 4) +#define AT91_SFR_EBICFG_SCH0_ON (0x1 << 4) +#define AT91_SFR_EBICFG_DRIVE1 (0x3 << 8) +#define AT91_SFR_EBICFG_DRIVE1_LOW (0x0 << 8) +#define AT91_SFR_EBICFG_DRIVE1_MEDIUM (0x2 << 8) +#define AT91_SFR_EBICFG_DRIVE1_HIGH (0x3 << 8) +#define AT91_SFR_EBICFG_PULL1 (0x3 << 10) +#define AT91_SFR_EBICFG_PULL1_UP (0x0 << 10) +#define AT91_SFR_EBICFG_PULL1_NONE (0x1 << 10) +#define AT91_SFR_EBICFG_PULL1_DOWN (0x3 << 10) +#define AT91_SFR_EBICFG_SCH1 (0x1 << 12) +#define AT91_SFR_EBICFG_SCH1_OFF (0x0 << 12) +#define AT91_SFR_EBICFG_SCH1_ON (0x1 << 12) + /* Bit field in AICREDIR */ #define ATMEL_SFR_AICREDIR_NSAIC 0x00000001 diff --git a/arch/arm/mach-at91/include/mach/sama5d2.h b/arch/arm/mach-at91/include/mach/sama5d2.h index dd5a2a7..25c8541 100644 --- a/arch/arm/mach-at91/include/mach/sama5d2.h +++ b/arch/arm/mach-at91/include/mach/sama5d2.h @@ -135,7 +135,11 @@ /* * Address Memory Space */ +#define ATMEL_BASE_CS0 0x10000000 #define ATMEL_BASE_DDRCS 0x20000000 +#define ATMEL_BASE_CS1 0x60000000 +#define ATMEL_BASE_CS2 0x70000000 +#define ATMEL_BASE_CS3 0x80000000 #define ATMEL_BASE_QSPI0_AES_MEM 0x90000000 #define ATMEL_BASE_QSPI1_AES_MEM 0x98000000 #define ATMEL_BASE_SDMMC0 0xa0000000 @@ -165,6 +169,7 @@ */ #define ATMEL_BASE_PMECC (ATMEL_BASE_HSMC + 0x70) #define ATMEL_BASE_PMERRLOC (ATMEL_BASE_HSMC + 0x500) +#define ATMEL_BASE_SMC (ATMEL_BASE_HSMC + 0x700) #define ATMEL_BASE_PIOB (ATMEL_BASE_PIOA + 0x40) #define ATMEL_BASE_PIOC (ATMEL_BASE_PIOB + 0x40)
They will be used on SAMA5D2 PTC board. Signed-off-by: Wenyou Yang <wenyou.yang@atmel.com> --- arch/arm/mach-at91/include/mach/sama5_sfr.h | 24 ++++++++++++++++++++++++ arch/arm/mach-at91/include/mach/sama5d2.h | 5 +++++ 2 files changed, 29 insertions(+)