On Sat, 29 Jan 2022 10:23:09 -0500 Jesse Taube <mr.bossman...@gmail.com> wrote:
> From: Icenowy Zheng <icen...@aosc.io> > > The Lichee Pi Nano is a board based on the F1C100s. > Add defconfigs for it. Looks very nice now, many thanks! > > Signed-off-by: Icenowy Zheng <icen...@aosc.io> > Signed-off-by: Jesse Taube <mr.bossman...@gmail.com> Reviewed-by: Andre Przywara <andre.przyw...@arm.com> Cheers, Andre > --- > V1->V2: > * Add SKIP_LOWLEVEL_INIT_ONLY > * Remove spi defconfig > V2->V3: > * Move SYS_MALLOC_F_LEN to kconf and format it > * Move SYS_LOAD_ADDR to kconf and format it > * Move SYS_TEXT_BASE to kconf and format it > > --- > Kconfig | 8 +++++--- > boot/Kconfig | 7 ++++--- > configs/licheepi_nano_defconfig | 11 +++++++++++ > 3 files changed, 20 insertions(+), 6 deletions(-) > create mode 100644 configs/licheepi_nano_defconfig > > diff --git a/Kconfig b/Kconfig > index c46f4fce86..ef4e350ea8 100644 > --- a/Kconfig > +++ b/Kconfig > @@ -246,9 +246,10 @@ config SYS_MALLOC_F_LEN > config SYS_MALLOC_LEN > hex "Define memory for Dynamic allocation" > default 0x2000000 if ARCH_ROCKCHIP || ARCH_OMAP2PLUS || ARCH_MESON > - default 0x4020000 if ARCH_SUNXI && !MACH_SUN8I_V3S > default 0x200000 if ARCH_BMIPS || X86 > - default 0x220000 if ARCH_SUNXI && MACH_SUN8I_V3S > + default 0x120000 if MACH_SUNIV > + default 0x220000 if MACH_SUN8I_V3S > + default 0x4020000 if ARCH_SUNXI > default 0x400000 > help > This defines memory to be allocated for Dynamic allocation > @@ -391,8 +392,9 @@ config SYS_LOAD_ADDR > hex "Address in memory to use by default" > default 0x01000000 if ARCH_SOCFPGA > default 0x02000000 if PPC || X86 > + default 0x81000000 if MACH_SUNIV > default 0x22000000 if MACH_SUN9I > - default 0x42000000 if ARCH_SUNXI && !MACH_SUN9I > + default 0x42000000 if ARCH_SUNXI > default 0x82000000 if ARCH_KEYSTONE || ARCH_OMAP2PLUS || ARCH_K3 > default 0x82000000 if ARCH_MX6 && (MX6SL || MX6SLL || MX6SX || MX6UL > || MX6ULL) > default 0x12000000 if ARCH_MX6 && !(MX6SL || MX6SLL || MX6SX || MX6UL > || MX6ULL) > diff --git a/boot/Kconfig b/boot/Kconfig > index f1ce576ab2..d16acfe563 100644 > --- a/boot/Kconfig > +++ b/boot/Kconfig > @@ -351,9 +351,10 @@ config SYS_TEXT_BASE > depends on HAVE_SYS_TEXT_BASE > default 0x0 if POSITION_INDEPENDENT > default 0x80800000 if ARCH_OMAP2PLUS || ARCH_K3 > - default 0x4a000000 if ARCH_SUNXI && !MACH_SUN9I && !MACH_SUN8I_V3S > - default 0x2a000000 if ARCH_SUNXI && MACH_SUN9I > - default 0x42e00000 if ARCH_SUNXI && MACH_SUN8I_V3S > + default 0x81700000 if MACH_SUNIV > + default 0x2a000000 if MACH_SUN9I > + default 0x42e00000 if MACH_SUN8I_V3S > + default 0x4a000000 if ARCH_SUNXI > hex "Text Base" > help > The address in memory that U-Boot will be running from, initially. > diff --git a/configs/licheepi_nano_defconfig b/configs/licheepi_nano_defconfig > new file mode 100644 > index 0000000000..ecec869d18 > --- /dev/null > +++ b/configs/licheepi_nano_defconfig > @@ -0,0 +1,11 @@ > +CONFIG_ARM=y > +CONFIG_ARCH_SUNXI=y > +CONFIG_MACH_SUNIV=y > +CONFIG_SKIP_LOWLEVEL_INIT_ONLY=y > +CONFIG_SPL_SKIP_LOWLEVEL_INIT_ONLY=y > +CONFIG_DRAM_CLK=156 > +CONFIG_SYS_DCACHE_OFF=y > +CONFIG_DRAM_ZQ=0 > +# CONFIG_VIDEO_SUNXI is not set > +CONFIG_DEFAULT_DEVICE_TREE="suniv-f1c100s-licheepi-nano" > +CONFIG_SPL=y