Message ID | 20170115185215.31439-1-afaerber@suse.de |
---|---|
State | Superseded |
Headers | show |
On 15/01/2017 19:52, Andreas Färber wrote: > Use the generic "distro" boot framework to enable automatic DHCP boot. > > The fdt and kernel addresses are adopted from downstream; ramdisk and > scriptaddr addresses were chosen arbitrarily. > > Signed-off-by: Andreas Färber <afaerber@suse.de> > --- > Kconfig | 1 + > configs/odroid-c2_defconfig | 1 - > include/configs/meson-gxbb-common.h | 14 ++++++++++++++ > include/configs/odroid-c2.h | 2 ++ > 4 files changed, 17 insertions(+), 1 deletion(-) > > diff --git a/Kconfig b/Kconfig > index 3f79f6f..166fbf8 100644 > --- a/Kconfig > +++ b/Kconfig > @@ -57,6 +57,7 @@ config DISTRO_DEFAULTS > bool "Select defaults suitable for booting general purpose Linux distributions" > default y if ARCH_SUNXI || TEGRA > default y if ARCH_LS2080A > + default y if ARCH_MESON > default y if ARCH_ROCKCHIP > default n > select CMD_BOOTZ if ARM && !ARM64 > diff --git a/configs/odroid-c2_defconfig b/configs/odroid-c2_defconfig > index 7d0b2b1..119ab07 100644 > --- a/configs/odroid-c2_defconfig > +++ b/configs/odroid-c2_defconfig > @@ -13,7 +13,6 @@ CONFIG_HUSH_PARSER=y > # CONFIG_CMD_IMLS is not set > # CONFIG_CMD_LOADS is not set > # CONFIG_CMD_FPGA is not set > -# CONFIG_CMD_SOURCE is not set > # CONFIG_CMD_SETEXPR is not set > CONFIG_OF_CONTROL=y > CONFIG_NET_RANDOM_ETHADDR=y > diff --git a/include/configs/meson-gxbb-common.h b/include/configs/meson-gxbb-common.h > index 3bba2e6..75f6dc5 100644 > --- a/include/configs/meson-gxbb-common.h > +++ b/include/configs/meson-gxbb-common.h > @@ -40,4 +40,18 @@ > > #include <config_distro_defaults.h> > > +#define BOOT_TARGET_DEVICES(func) \ > + func(DHCP, dhcp, na) I probably asked this 50 times before already. If so, please forgive me asking a 51st time. Is network the only I/O you have available in U-Boot on that system? No SATA? No MMC? If so, please note it in the patch description, so that it's clear to someone looking at U-Boot's patch history why we're limiting ourselves to DHCP boot. The rest looks perfectly reasonable to me. Alex > + > +#include <config_distro_bootcmd.h> > + > +#define CONFIG_EXTRA_ENV_SETTINGS \ > + "fdt_addr_r=0x01000000\0" \ > + "scriptaddr=0x1f000000\0" \ > + "kernel_addr_r=0x01080000\0" \ > + "pxefile_addr_r=0x01080000\0" \ > + "ramdisk_addr_r=0x10000000\0" \ > + MESON_FDTFILE_SETTING \ > + BOOTENV > + > #endif /* __MESON_GXBB_COMMON_CONFIG_H */ > diff --git a/include/configs/odroid-c2.h b/include/configs/odroid-c2.h > index 1d5b3d5..bf7e1af 100644 > --- a/include/configs/odroid-c2.h > +++ b/include/configs/odroid-c2.h > @@ -12,6 +12,8 @@ > #define CONFIG_CONS_INDEX 0 > #define CONFIG_BAUDRATE 115200 > > +#define MESON_FDTFILE_SETTING "fdtfile=amlogic/meson-gxbb-odroidc2.dtb\0" > + > #include <configs/meson-gxbb-common.h> > > #endif /* __CONFIG_H */ >
Am 15.01.2017 um 20:03 schrieb Alexander Graf: > On 15/01/2017 19:52, Andreas Färber wrote: >> Use the generic "distro" boot framework to enable automatic DHCP boot. >> >> The fdt and kernel addresses are adopted from downstream; ramdisk and >> scriptaddr addresses were chosen arbitrarily. >> >> Signed-off-by: Andreas Färber <afaerber@suse.de> >> --- >> Kconfig | 1 + >> configs/odroid-c2_defconfig | 1 - >> include/configs/meson-gxbb-common.h | 14 ++++++++++++++ >> include/configs/odroid-c2.h | 2 ++ >> 4 files changed, 17 insertions(+), 1 deletion(-) >> >> diff --git a/Kconfig b/Kconfig >> index 3f79f6f..166fbf8 100644 >> --- a/Kconfig >> +++ b/Kconfig >> @@ -57,6 +57,7 @@ config DISTRO_DEFAULTS >> bool "Select defaults suitable for booting general purpose Linux >> distributions" >> default y if ARCH_SUNXI || TEGRA >> default y if ARCH_LS2080A >> + default y if ARCH_MESON >> default y if ARCH_ROCKCHIP >> default n >> select CMD_BOOTZ if ARM && !ARM64 >> diff --git a/configs/odroid-c2_defconfig b/configs/odroid-c2_defconfig >> index 7d0b2b1..119ab07 100644 >> --- a/configs/odroid-c2_defconfig >> +++ b/configs/odroid-c2_defconfig >> @@ -13,7 +13,6 @@ CONFIG_HUSH_PARSER=y >> # CONFIG_CMD_IMLS is not set >> # CONFIG_CMD_LOADS is not set >> # CONFIG_CMD_FPGA is not set >> -# CONFIG_CMD_SOURCE is not set >> # CONFIG_CMD_SETEXPR is not set >> CONFIG_OF_CONTROL=y >> CONFIG_NET_RANDOM_ETHADDR=y >> diff --git a/include/configs/meson-gxbb-common.h >> b/include/configs/meson-gxbb-common.h >> index 3bba2e6..75f6dc5 100644 >> --- a/include/configs/meson-gxbb-common.h >> +++ b/include/configs/meson-gxbb-common.h >> @@ -40,4 +40,18 @@ >> >> #include <config_distro_defaults.h> >> >> +#define BOOT_TARGET_DEVICES(func) \ >> + func(DHCP, dhcp, na) > > I probably asked this 50 times before already. If so, please forgive me > asking a 51st time. > > Is network the only I/O you have available in U-Boot on that system? No > SATA? No MMC? Yep, no improvement yet: https://patchwork.ozlabs.org/patch/690146/ I've tried to rebase Carlo's MMC patches and am able to boot into U-Boot, but when accessing SD or eMMC it freezes. Lack of MMC drivers shouldn't hold up obviously missing address and fdtfile definitions here. > If so, please note it in the patch description, so that it's clear to > someone looking at U-Boot's patch history why we're limiting ourselves > to DHCP boot. Honestly, I don't think that's the reason v1 hasn't been applied... ;) > The rest looks perfectly reasonable to me. Thanks, I changed the addresses from v1 to the ones from the vendor as far as possible. Cheers, Andreas
> Am 15.01.2017 um 20:20 schrieb Andreas Färber <afaerber@suse.de>: > >> Am 15.01.2017 um 20:03 schrieb Alexander Graf: >>> On 15/01/2017 19:52, Andreas Färber wrote: >>> Use the generic "distro" boot framework to enable automatic DHCP boot. >>> >>> The fdt and kernel addresses are adopted from downstream; ramdisk and >>> scriptaddr addresses were chosen arbitrarily. >>> >>> Signed-off-by: Andreas Färber <afaerber@suse.de> >>> --- >>> Kconfig | 1 + >>> configs/odroid-c2_defconfig | 1 - >>> include/configs/meson-gxbb-common.h | 14 ++++++++++++++ >>> include/configs/odroid-c2.h | 2 ++ >>> 4 files changed, 17 insertions(+), 1 deletion(-) >>> >>> diff --git a/Kconfig b/Kconfig >>> index 3f79f6f..166fbf8 100644 >>> --- a/Kconfig >>> +++ b/Kconfig >>> @@ -57,6 +57,7 @@ config DISTRO_DEFAULTS >>> bool "Select defaults suitable for booting general purpose Linux >>> distributions" >>> default y if ARCH_SUNXI || TEGRA >>> default y if ARCH_LS2080A >>> + default y if ARCH_MESON >>> default y if ARCH_ROCKCHIP >>> default n >>> select CMD_BOOTZ if ARM && !ARM64 >>> diff --git a/configs/odroid-c2_defconfig b/configs/odroid-c2_defconfig >>> index 7d0b2b1..119ab07 100644 >>> --- a/configs/odroid-c2_defconfig >>> +++ b/configs/odroid-c2_defconfig >>> @@ -13,7 +13,6 @@ CONFIG_HUSH_PARSER=y >>> # CONFIG_CMD_IMLS is not set >>> # CONFIG_CMD_LOADS is not set >>> # CONFIG_CMD_FPGA is not set >>> -# CONFIG_CMD_SOURCE is not set >>> # CONFIG_CMD_SETEXPR is not set >>> CONFIG_OF_CONTROL=y >>> CONFIG_NET_RANDOM_ETHADDR=y >>> diff --git a/include/configs/meson-gxbb-common.h >>> b/include/configs/meson-gxbb-common.h >>> index 3bba2e6..75f6dc5 100644 >>> --- a/include/configs/meson-gxbb-common.h >>> +++ b/include/configs/meson-gxbb-common.h >>> @@ -40,4 +40,18 @@ >>> >>> #include <config_distro_defaults.h> >>> >>> +#define BOOT_TARGET_DEVICES(func) \ >>> + func(DHCP, dhcp, na) >> >> I probably asked this 50 times before already. If so, please forgive me >> asking a 51st time. >> >> Is network the only I/O you have available in U-Boot on that system? No >> SATA? No MMC? > > Yep, no improvement yet: https://patchwork.ozlabs.org/patch/690146/ > > I've tried to rebase Carlo's MMC patches and am able to boot into > U-Boot, but when accessing SD or eMMC it freezes. > > Lack of MMC drivers shouldn't hold up obviously missing address and > fdtfile definitions here. > >> If so, please note it in the patch description, so that it's clear to >> someone looking at U-Boot's patch history why we're limiting ourselves >> to DHCP boot. > > Honestly, I don't think that's the reason v1 hasn't been applied... ;) I agree, so what is the holdup? The merge window is open. Alex
Hi, Am 22.04.2017 um 14:59 schrieb Heinrich Schuchardt: > On 01/15/2017 07:52 PM, Andreas Färber wrote: >> Use the generic "distro" boot framework to enable automatic DHCP boot. >> >> The fdt and kernel addresses are adopted from downstream; ramdisk and >> scriptaddr addresses were chosen arbitrarily. >> >> Signed-off-by: Andreas Färber <afaerber@suse.de> >> --- > ... >> diff --git a/include/configs/odroid-c2.h b/include/configs/odroid-c2.h >> index 1d5b3d5..bf7e1af 100644 >> --- a/include/configs/odroid-c2.h >> +++ b/include/configs/odroid-c2.h >> @@ -12,6 +12,8 @@ >> #define CONFIG_CONS_INDEX 0 >> #define CONFIG_BAUDRATE 115200 >> >> +#define MESON_FDTFILE_SETTING "fdtfile=amlogic/meson-gxbb-odroidc2.dtb\0" > > Hello Andreas, > > do you remember why you chose to put meson-gxbb-odroidc2.dtb into > subdirectory amlogic? I chose that directory name when I added GXBaby support to the kernel: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/arch/arm64/boot/dts Note that we had a discussion about this a while ago when I sent patches to amend the distro framework's dtb search paths, and Tom's decision was to instead hardcode the vendor dirs inside $fdtfile. > This breaks package flash-kernel in Debian. Then your package may also have problems with the Raspberry Pi 3 and further arm64 boards. For sunXi I have a pending patch to fix it. If others are not yet doing it, consider it a bug and file patches please. Regards, Andreas
On 04/22/2017 03:10 PM, Andreas Färber wrote: > Hi, > > Am 22.04.2017 um 14:59 schrieb Heinrich Schuchardt: >> On 01/15/2017 07:52 PM, Andreas Färber wrote: >>> Use the generic "distro" boot framework to enable automatic DHCP boot. >>> >>> The fdt and kernel addresses are adopted from downstream; ramdisk and >>> scriptaddr addresses were chosen arbitrarily. >>> >>> Signed-off-by: Andreas Färber <afaerber@suse.de> >>> --- >> ... >>> diff --git a/include/configs/odroid-c2.h b/include/configs/odroid-c2.h >>> index 1d5b3d5..bf7e1af 100644 >>> --- a/include/configs/odroid-c2.h >>> +++ b/include/configs/odroid-c2.h >>> @@ -12,6 +12,8 @@ >>> #define CONFIG_CONS_INDEX 0 >>> #define CONFIG_BAUDRATE 115200 >>> >>> +#define MESON_FDTFILE_SETTING "fdtfile=amlogic/meson-gxbb-odroidc2.dtb\0" >> >> Hello Andreas, >> >> do you remember why you chose to put meson-gxbb-odroidc2.dtb into >> subdirectory amlogic? > > I chose that directory name when I added GXBaby support to the kernel: > > https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/arch/arm64/boot/dts > > Note that we had a discussion about this a while ago when I sent patches > to amend the distro framework's dtb search paths, and Tom's decision was > to instead hardcode the vendor dirs inside $fdtfile. I am aware that in the Linux Kernel vendor subdirectories are used for arm64 dtbs. I was questioning about U-Boot. I could not find any usage of subdirectories for other arm64 boards: hikey_defconfig: fdtfile=hi6220-hikey.dtb dragonboard410c_defconfig: fdtfile=apq8016-sbc.dtb but odroid-c2_defconfig: fdtfile=amlogic/meson-gxbb-odroidc2.dtb Best regards Heinrich Schuchardt
On 04/22/2017 03:10 PM, Andreas Färber wrote: > Hi, > > Am 22.04.2017 um 14:59 schrieb Heinrich Schuchardt: >> On 01/15/2017 07:52 PM, Andreas Färber wrote: >>> Use the generic "distro" boot framework to enable automatic DHCP boot. >>> >>> The fdt and kernel addresses are adopted from downstream; ramdisk and >>> scriptaddr addresses were chosen arbitrarily. >>> >>> Signed-off-by: Andreas Färber <afaerber@suse.de> >>> --- >> ... >>> diff --git a/include/configs/odroid-c2.h b/include/configs/odroid-c2.h >>> index 1d5b3d5..bf7e1af 100644 >>> --- a/include/configs/odroid-c2.h >>> +++ b/include/configs/odroid-c2.h >>> @@ -12,6 +12,8 @@ >>> #define CONFIG_CONS_INDEX 0 >>> #define CONFIG_BAUDRATE 115200 >>> >>> +#define MESON_FDTFILE_SETTING "fdtfile=amlogic/meson-gxbb-odroidc2.dtb\0" >> >> Hello Andreas, >> >> do you remember why you chose to put meson-gxbb-odroidc2.dtb into >> subdirectory amlogic? > > I chose that directory name when I added GXBaby support to the kernel: > > https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/arch/arm64/boot/dts > > Note that we had a discussion about this a while ago when I sent patches > to amend the distro framework's dtb search paths, and Tom's decision was > to instead hardcode the vendor dirs inside $fdtfile. The following mail by Tom Rini just mentions the the file name should match between Linux and U-Boot but does not ask for a vendor subdirectory hardcoded in fdtfile: https://lists.denx.de/pipermail/u-boot/2016-April/251709.html And the dragonboard ended up with fdtfile=apq8016-sbc.dtb without vendor directory. Could you, please, refer me to the mail with the decision that you mentioned. Regards Heinrich Schuchardt > >> This breaks package flash-kernel in Debian. > > Then your package may also have problems with the Raspberry Pi 3 and > further arm64 boards. For sunXi I have a pending patch to fix it. If > others are not yet doing it, consider it a bug and file patches please. > > Regards, > Andreas >
Am 22.04.2017 um 16:19 schrieb Heinrich Schuchardt: > On 04/22/2017 03:10 PM, Andreas Färber wrote: >> Am 22.04.2017 um 14:59 schrieb Heinrich Schuchardt: >>> On 01/15/2017 07:52 PM, Andreas Färber wrote: >>>> Use the generic "distro" boot framework to enable automatic DHCP boot. >>>> >>>> The fdt and kernel addresses are adopted from downstream; ramdisk and >>>> scriptaddr addresses were chosen arbitrarily. >>>> >>>> Signed-off-by: Andreas Färber <afaerber@suse.de> >>>> --- >>> ... >>>> diff --git a/include/configs/odroid-c2.h b/include/configs/odroid-c2.h >>>> index 1d5b3d5..bf7e1af 100644 >>>> --- a/include/configs/odroid-c2.h >>>> +++ b/include/configs/odroid-c2.h >>>> @@ -12,6 +12,8 @@ >>>> #define CONFIG_CONS_INDEX 0 >>>> #define CONFIG_BAUDRATE 115200 >>>> >>>> +#define MESON_FDTFILE_SETTING "fdtfile=amlogic/meson-gxbb-odroidc2.dtb\0" >>> >>> do you remember why you chose to put meson-gxbb-odroidc2.dtb into >>> subdirectory amlogic? >> >> I chose that directory name when I added GXBaby support to the kernel: >> >> https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/arch/arm64/boot/dts >> >> Note that we had a discussion about this a while ago when I sent patches >> to amend the distro framework's dtb search paths, and Tom's decision was >> to instead hardcode the vendor dirs inside $fdtfile. > > I am aware that in the Linux Kernel vendor subdirectories are used for > arm64 dtbs. And therefore that is the expected installation location of the .dtb files shipped with the kernel. If your distro wants to differ, you are free to compensate with symlinks - which is what has been forced onto us with the old situation. > I was questioning about U-Boot. I could not find any usage of > subdirectories for other arm64 boards: > > hikey_defconfig: fdtfile=hi6220-hikey.dtb > dragonboard410c_defconfig: fdtfile=apq8016-sbc.dtb > > but > > odroid-c2_defconfig: fdtfile=amlogic/meson-gxbb-odroidc2.dtb I mentioned RPi3: board/raspberrypi/rpi/rpi.c:#define DTB_DIR "broadcom/" Like I said, patches welcome. HiKey and Dragonboard410c not yet running an official JeOS image (cf. my BUD17 talk) may be one reason we haven't bothered yet. Also it wasn't clear to me what Tom wanted exactly based on his reply, so I never followed up. For sunxi, search the list for "fdtfile" in the subject. Need to do some more shopping, so can't help you search right now. Regards, Andreas
On 04/22/2017 05:47 PM, Andreas Färber wrote: > Am 22.04.2017 um 16:19 schrieb Heinrich Schuchardt: >> On 04/22/2017 03:10 PM, Andreas Färber wrote: >>> Am 22.04.2017 um 14:59 schrieb Heinrich Schuchardt: >>>> On 01/15/2017 07:52 PM, Andreas Färber wrote: >>>>> Use the generic "distro" boot framework to enable automatic DHCP boot. >>>>> >>>>> The fdt and kernel addresses are adopted from downstream; ramdisk and >>>>> scriptaddr addresses were chosen arbitrarily. >>>>> >>>>> Signed-off-by: Andreas Färber <afaerber@suse.de> >>>>> --- >>>> ... >>>>> diff --git a/include/configs/odroid-c2.h b/include/configs/odroid-c2.h >>>>> index 1d5b3d5..bf7e1af 100644 >>>>> --- a/include/configs/odroid-c2.h >>>>> +++ b/include/configs/odroid-c2.h >>>>> @@ -12,6 +12,8 @@ >>>>> #define CONFIG_CONS_INDEX 0 >>>>> #define CONFIG_BAUDRATE 115200 >>>>> >>>>> +#define MESON_FDTFILE_SETTING "fdtfile=amlogic/meson-gxbb-odroidc2.dtb\0" >>>> >>>> do you remember why you chose to put meson-gxbb-odroidc2.dtb into >>>> subdirectory amlogic? >>> >>> I chose that directory name when I added GXBaby support to the kernel: >>> >>> https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/arch/arm64/boot/dts >>> >>> Note that we had a discussion about this a while ago when I sent patches >>> to amend the distro framework's dtb search paths, and Tom's decision was >>> to instead hardcode the vendor dirs inside $fdtfile. >> >> I am aware that in the Linux Kernel vendor subdirectories are used for >> arm64 dtbs. > > And therefore that is the expected installation location of the .dtb > files shipped with the kernel. If your distro wants to differ, you are > free to compensate with symlinks - which is what has been forced onto us > with the old situation. > >> I was questioning about U-Boot. I could not find any usage of >> subdirectories for other arm64 boards: >> >> hikey_defconfig: fdtfile=hi6220-hikey.dtb >> dragonboard410c_defconfig: fdtfile=apq8016-sbc.dtb >> >> but >> >> odroid-c2_defconfig: fdtfile=amlogic/meson-gxbb-odroidc2.dtb > > I mentioned RPi3: > > board/raspberrypi/rpi/rpi.c:#define DTB_DIR "broadcom/" > > Like I said, patches welcome. HiKey and Dragonboard410c not yet running > an official JeOS image (cf. my BUD17 talk) may be one reason we haven't > bothered yet. Also it wasn't clear to me what Tom wanted exactly based > on his reply, so I never followed up. For sunxi, search the list for > "fdtfile" in the subject. Need to do some more shopping, so can't help > you search right now. I am not on JeOS. I referred to Debian. This the result for sunxi: pine64_plus_defconfig: fdtfile=sun50i-a64-pine6-plus.dtb According doc/README.pxe ftdfile was never meant to contain a path. If you want a path this should be defined as ftddir. So Odroid C2 is buggy and we should clean up the fdtfile variable. Best regards Heinrich Schuchardt > > Regards, > Andreas >
Am 22.04.2017 um 20:32 schrieb Heinrich Schuchardt: > On 04/22/2017 05:47 PM, Andreas Färber wrote: >> Am 22.04.2017 um 16:19 schrieb Heinrich Schuchardt: >>> On 04/22/2017 03:10 PM, Andreas Färber wrote: >>>> Am 22.04.2017 um 14:59 schrieb Heinrich Schuchardt: >>>>> On 01/15/2017 07:52 PM, Andreas Färber wrote: >>>>>> Use the generic "distro" boot framework to enable automatic DHCP boot. >>>>>> >>>>>> The fdt and kernel addresses are adopted from downstream; ramdisk and >>>>>> scriptaddr addresses were chosen arbitrarily. >>>>>> >>>>>> Signed-off-by: Andreas Färber <afaerber@suse.de> >>>>>> --- >>>>> ... >>>>>> diff --git a/include/configs/odroid-c2.h b/include/configs/odroid-c2.h >>>>>> index 1d5b3d5..bf7e1af 100644 >>>>>> --- a/include/configs/odroid-c2.h >>>>>> +++ b/include/configs/odroid-c2.h >>>>>> @@ -12,6 +12,8 @@ >>>>>> #define CONFIG_CONS_INDEX 0 >>>>>> #define CONFIG_BAUDRATE 115200 >>>>>> >>>>>> +#define MESON_FDTFILE_SETTING "fdtfile=amlogic/meson-gxbb-odroidc2.dtb\0" >>>>> >>>>> do you remember why you chose to put meson-gxbb-odroidc2.dtb into >>>>> subdirectory amlogic? >>>> >>>> I chose that directory name when I added GXBaby support to the kernel: >>>> >>>> https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/arch/arm64/boot/dts >>>> >>>> Note that we had a discussion about this a while ago when I sent patches >>>> to amend the distro framework's dtb search paths, and Tom's decision was >>>> to instead hardcode the vendor dirs inside $fdtfile. >>> >>> I am aware that in the Linux Kernel vendor subdirectories are used for >>> arm64 dtbs. >> >> And therefore that is the expected installation location of the .dtb >> files shipped with the kernel. If your distro wants to differ, you are >> free to compensate with symlinks - which is what has been forced onto us >> with the old situation. >> >>> I was questioning about U-Boot. I could not find any usage of >>> subdirectories for other arm64 boards: >>> >>> hikey_defconfig: fdtfile=hi6220-hikey.dtb >>> dragonboard410c_defconfig: fdtfile=apq8016-sbc.dtb >>> >>> but >>> >>> odroid-c2_defconfig: fdtfile=amlogic/meson-gxbb-odroidc2.dtb >> >> I mentioned RPi3: >> >> board/raspberrypi/rpi/rpi.c:#define DTB_DIR "broadcom/" >> >> Like I said, patches welcome. HiKey and Dragonboard410c not yet running >> an official JeOS image (cf. my BUD17 talk) may be one reason we haven't >> bothered yet. Also it wasn't clear to me what Tom wanted exactly based >> on his reply, so I never followed up. For sunxi, search the list for >> "fdtfile" in the subject. Need to do some more shopping, so can't help >> you search right now. > > I am not on JeOS. I referred to Debian. > > This the result for sunxi: > pine64_plus_defconfig: fdtfile=sun50i-a64-pine6-plus.dtb > > According doc/README.pxe ftdfile was never meant to contain a path. If > you want a path this should be defined as ftddir. http://git.denx.de/?p=u-boot.git;a=blob;f=include/config_distro_bootcmd.h;h=0e01e8240dd55fa60b31e9e7c6d72d7e768cf882;hb=HEAD does not have a single hit for fdtdir, so that is no solution. Regards, Andreas > > So Odroid C2 is buggy and we should clean up the fdtfile variable. > > Best regards > > Heinrich Schuchardt > >> >> Regards, >> Andreas >> >
Am 22.04.2017 um 16:51 schrieb Heinrich Schuchardt: > On 04/22/2017 03:10 PM, Andreas Färber wrote: >> Hi, >> >> Am 22.04.2017 um 14:59 schrieb Heinrich Schuchardt: >>> On 01/15/2017 07:52 PM, Andreas Färber wrote: >>>> Use the generic "distro" boot framework to enable automatic DHCP boot. >>>> >>>> The fdt and kernel addresses are adopted from downstream; ramdisk and >>>> scriptaddr addresses were chosen arbitrarily. >>>> >>>> Signed-off-by: Andreas Färber <afaerber@suse.de> >>>> --- >>> ... >>>> diff --git a/include/configs/odroid-c2.h b/include/configs/odroid-c2.h >>>> index 1d5b3d5..bf7e1af 100644 >>>> --- a/include/configs/odroid-c2.h >>>> +++ b/include/configs/odroid-c2.h >>>> @@ -12,6 +12,8 @@ >>>> #define CONFIG_CONS_INDEX 0 >>>> #define CONFIG_BAUDRATE 115200 >>>> >>>> +#define MESON_FDTFILE_SETTING "fdtfile=amlogic/meson-gxbb-odroidc2.dtb\0" >>> >>> Hello Andreas, >>> >>> do you remember why you chose to put meson-gxbb-odroidc2.dtb into >>> subdirectory amlogic? >> >> I chose that directory name when I added GXBaby support to the kernel: >> >> https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/arch/arm64/boot/dts >> >> Note that we had a discussion about this a while ago when I sent patches >> to amend the distro framework's dtb search paths, and Tom's decision was >> to instead hardcode the vendor dirs inside $fdtfile. > > The following mail by Tom Rini just mentions the the file name should > match between Linux and U-Boot but does not ask for a vendor > subdirectory hardcoded in fdtfile: > https://lists.denx.de/pipermail/u-boot/2016-April/251709.html > > And the dragonboard ended up with fdtfile=apq8016-sbc.dtb without vendor > directory. > > Could you, please, refer me to the mail with the decision that you > mentioned. Quoting "Re: [U-Boot] [PATCH 4/6] efi_loader: Improve .dtb search for arm64" from Jul 12 2016 20:05: "Please re-work the series around this idea." Regards, Andreas
Am 23.04.2017 um 12:41 schrieb Andreas Färber: > Am 22.04.2017 um 16:51 schrieb Heinrich Schuchardt: >> On 04/22/2017 03:10 PM, Andreas Färber wrote: >>> Hi, >>> >>> Am 22.04.2017 um 14:59 schrieb Heinrich Schuchardt: >>>> On 01/15/2017 07:52 PM, Andreas Färber wrote: >>>>> Use the generic "distro" boot framework to enable automatic DHCP boot. >>>>> >>>>> The fdt and kernel addresses are adopted from downstream; ramdisk and >>>>> scriptaddr addresses were chosen arbitrarily. >>>>> >>>>> Signed-off-by: Andreas Färber <afaerber@suse.de> >>>>> --- >>>> ... >>>>> diff --git a/include/configs/odroid-c2.h b/include/configs/odroid-c2.h >>>>> index 1d5b3d5..bf7e1af 100644 >>>>> --- a/include/configs/odroid-c2.h >>>>> +++ b/include/configs/odroid-c2.h >>>>> @@ -12,6 +12,8 @@ >>>>> #define CONFIG_CONS_INDEX 0 >>>>> #define CONFIG_BAUDRATE 115200 >>>>> >>>>> +#define MESON_FDTFILE_SETTING "fdtfile=amlogic/meson-gxbb-odroidc2.dtb\0" >>>> >>>> Hello Andreas, >>>> >>>> do you remember why you chose to put meson-gxbb-odroidc2.dtb into >>>> subdirectory amlogic? >>> >>> I chose that directory name when I added GXBaby support to the kernel: >>> >>> https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/arch/arm64/boot/dts >>> >>> Note that we had a discussion about this a while ago when I sent patches >>> to amend the distro framework's dtb search paths, and Tom's decision was >>> to instead hardcode the vendor dirs inside $fdtfile. >> >> The following mail by Tom Rini just mentions the the file name should >> match between Linux and U-Boot but does not ask for a vendor >> subdirectory hardcoded in fdtfile: >> https://lists.denx.de/pipermail/u-boot/2016-April/251709.html >> >> And the dragonboard ended up with fdtfile=apq8016-sbc.dtb without vendor >> directory. >> >> Could you, please, refer me to the mail with the decision that you >> mentioned. > > Quoting "Re: [U-Boot] [PATCH 4/6] efi_loader: Improve .dtb search for > arm64" from Jul 12 2016 20:05: "Please re-work the series around this idea." ... and as documented there I even brought up the point that not all distros might stick to that structure. Tom considered that unlikely. ;) > > Regards, > Andreas >
diff --git a/Kconfig b/Kconfig index 3f79f6f..166fbf8 100644 --- a/Kconfig +++ b/Kconfig @@ -57,6 +57,7 @@ config DISTRO_DEFAULTS bool "Select defaults suitable for booting general purpose Linux distributions" default y if ARCH_SUNXI || TEGRA default y if ARCH_LS2080A + default y if ARCH_MESON default y if ARCH_ROCKCHIP default n select CMD_BOOTZ if ARM && !ARM64 diff --git a/configs/odroid-c2_defconfig b/configs/odroid-c2_defconfig index 7d0b2b1..119ab07 100644 --- a/configs/odroid-c2_defconfig +++ b/configs/odroid-c2_defconfig @@ -13,7 +13,6 @@ CONFIG_HUSH_PARSER=y # CONFIG_CMD_IMLS is not set # CONFIG_CMD_LOADS is not set # CONFIG_CMD_FPGA is not set -# CONFIG_CMD_SOURCE is not set # CONFIG_CMD_SETEXPR is not set CONFIG_OF_CONTROL=y CONFIG_NET_RANDOM_ETHADDR=y diff --git a/include/configs/meson-gxbb-common.h b/include/configs/meson-gxbb-common.h index 3bba2e6..75f6dc5 100644 --- a/include/configs/meson-gxbb-common.h +++ b/include/configs/meson-gxbb-common.h @@ -40,4 +40,18 @@ #include <config_distro_defaults.h> +#define BOOT_TARGET_DEVICES(func) \ + func(DHCP, dhcp, na) + +#include <config_distro_bootcmd.h> + +#define CONFIG_EXTRA_ENV_SETTINGS \ + "fdt_addr_r=0x01000000\0" \ + "scriptaddr=0x1f000000\0" \ + "kernel_addr_r=0x01080000\0" \ + "pxefile_addr_r=0x01080000\0" \ + "ramdisk_addr_r=0x10000000\0" \ + MESON_FDTFILE_SETTING \ + BOOTENV + #endif /* __MESON_GXBB_COMMON_CONFIG_H */ diff --git a/include/configs/odroid-c2.h b/include/configs/odroid-c2.h index 1d5b3d5..bf7e1af 100644 --- a/include/configs/odroid-c2.h +++ b/include/configs/odroid-c2.h @@ -12,6 +12,8 @@ #define CONFIG_CONS_INDEX 0 #define CONFIG_BAUDRATE 115200 +#define MESON_FDTFILE_SETTING "fdtfile=amlogic/meson-gxbb-odroidc2.dtb\0" + #include <configs/meson-gxbb-common.h> #endif /* __CONFIG_H */
Use the generic "distro" boot framework to enable automatic DHCP boot. The fdt and kernel addresses are adopted from downstream; ramdisk and scriptaddr addresses were chosen arbitrarily. Signed-off-by: Andreas Färber <afaerber@suse.de> --- Kconfig | 1 + configs/odroid-c2_defconfig | 1 - include/configs/meson-gxbb-common.h | 14 ++++++++++++++ include/configs/odroid-c2.h | 2 ++ 4 files changed, 17 insertions(+), 1 deletion(-)