Re: [U-Boot] [PATCH v1] rockchip: utilize CONFIG_DEFAULT_FDT_FILE
> On 22.06.2018, at 16:23, Vagrant Cascadian wrote: > > On 2018-05-27, Vagrant Cascadian wrote: >> On 2018-05-25, Klaus Goger wrote: >>> Currently the fdtfile environment variable is set to >>> CONFIG_DEFAULT_DEVICE_TREE which is іnternally used as U-Boot devicetree >>> source. The OS can use a different filename and Kconfig gives us the >>> ability to select a default devicetree via CONFIG_DEFAULT_FDT_FILE. >>> This also gives user configuring U-Boot via menuconfig the behaviour >>> someone would expect. > ... >> Tested on puma-rk3399. >> >> Tested-By: Vagrant Cascadian >> >> Was hoping to also test on firefly-rk3399, but having difficulty getting >> u-boot installed unreleated to this patch. > > Finally was able to test on Firefly-RK3399 applied against u-boot > 2018.07-rc2, and it also works correctly. > > Are there any outstanding concerns with this patch? There was a similar patch for sunxi[1] and there it was decided to introduce the Kconfig option we talked about. That would make this patch obsolete. @Jagan, I think Martin is still waiting for an answer from you. [1] https://patchwork.ozlabs.org/patch/923692/ signature.asc Description: Message signed with OpenPGP ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH v1] rockchip: utilize CONFIG_DEFAULT_FDT_FILE
On 2018-05-27, Vagrant Cascadian wrote: > On 2018-05-25, Klaus Goger wrote: >> Currently the fdtfile environment variable is set to >> CONFIG_DEFAULT_DEVICE_TREE which is іnternally used as U-Boot devicetree >> source. The OS can use a different filename and Kconfig gives us the >> ability to select a default devicetree via CONFIG_DEFAULT_FDT_FILE. >> This also gives user configuring U-Boot via menuconfig the behaviour >> someone would expect. ... > Tested on puma-rk3399. > > Tested-By: Vagrant Cascadian > > Was hoping to also test on firefly-rk3399, but having difficulty getting > u-boot installed unreleated to this patch. Finally was able to test on Firefly-RK3399 applied against u-boot 2018.07-rc2, and it also works correctly. Are there any outstanding concerns with this patch? live well, vagrant signature.asc Description: PGP signature ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH v1] rockchip: utilize CONFIG_DEFAULT_FDT_FILE
> On 27.05.2018, at 21:16, Vagrant Cascadianwrote: > > On 2018-05-25, Klaus Goger wrote: >> Currently the fdtfile environment variable is set to >> CONFIG_DEFAULT_DEVICE_TREE which is іnternally used as U-Boot devicetree >> source. The OS can use a different filename and Kconfig gives us the >> ability to select a default devicetree via CONFIG_DEFAULT_FDT_FILE. >> This also gives user configuring U-Boot via menuconfig the behaviour >> someone would expect. > > I did wonder, given that many of these boards the value for > CONFIG_DEFAULT_DEVICE_TREE and CONFIG_DEFAULT_FDT_FILE is *nearly* > identical, if it wouldn't make sense to derive CONFIG_DEFAULT_FDT_FILE > From the value of CONFIG_DEFAULT_DEVICE_TREE by default, only overriding > it in the unusual cases. > > Though there is a lot to be said about being explicit and not mixing the > two similar but not identical values. Would love to to that, but couldn’t find a proper way to do it. CONFIG_DEFAULT_FDT_FILE is a Kconfig string and therefore always present in the .config. If not set by the user or a defconfig it’s just a empty string (“”). So we can’t do a #ifdef and we can’t do string compares with C macros. An option would be to have DEFAULT_FDT_FILE be hidden behind a Kconfig bool (i.e CONFIG_DEFAULT_FDT_FILE depends on CONFIG_FDT_FILE) But that change looked a bit to invasive for me. > Tested on puma-rk3399. > > Tested-By: Vagrant Cascadian > > Was hoping to also test on firefly-rk3399, but having difficulty getting > u-boot installed unreleated to this patch. Also having troubles with > firefly-rk3288 due to mmc hanging the board: https://bugs.debian.org/898520. > > > live well, > vagrant > >> configs/puma-rk3399_defconfig | 1 + >> include/configs/rk3399_common.h | 2 +- > >> diff --git a/configs/puma-rk3399_defconfig b/configs/puma-rk3399_defconfig >> index e6539a7da8..e5753b4f20 100644 >> --- a/configs/puma-rk3399_defconfig >> +++ b/configs/puma-rk3399_defconfig >> @@ -16,6 +16,7 @@ CONFIG_DEBUG_UART=y >> CONFIG_FIT=y >> CONFIG_SPL_LOAD_FIT=y >> CONFIG_SPL_FIT_SOURCE="board/theobroma-systems/puma_rk3399/fit_spl_atf.its" >> +CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-puma-haikou.dtb" >> # CONFIG_DISPLAY_CPUINFO is not set >> CONFIG_DISPLAY_BOARDINFO_LATE=y >> CONFIG_SPL_BOARD_INIT=y > >> diff --git a/include/configs/rk3399_common.h >> b/include/configs/rk3399_common.h >> index a61e74bc03..ee38107ea5 100644 >> --- a/include/configs/rk3399_common.h >> +++ b/include/configs/rk3399_common.h >> @@ -55,7 +55,7 @@ >> #include >> #define CONFIG_EXTRA_ENV_SETTINGS \ >> ENV_MEM_LAYOUT_SETTINGS \ >> -"fdtfile=rockchip/" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0" \ >> +"fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \ >> "partitions=" PARTS_DEFAULT \ >> BOOTENV >> >> -- >> 2.11.0 signature.asc Description: Message signed with OpenPGP ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH v1] rockchip: utilize CONFIG_DEFAULT_FDT_FILE
On 2018-05-25, Klaus Goger wrote: > Currently the fdtfile environment variable is set to > CONFIG_DEFAULT_DEVICE_TREE which is іnternally used as U-Boot devicetree > source. The OS can use a different filename and Kconfig gives us the > ability to select a default devicetree via CONFIG_DEFAULT_FDT_FILE. > This also gives user configuring U-Boot via menuconfig the behaviour > someone would expect. I did wonder, given that many of these boards the value for CONFIG_DEFAULT_DEVICE_TREE and CONFIG_DEFAULT_FDT_FILE is *nearly* identical, if it wouldn't make sense to derive CONFIG_DEFAULT_FDT_FILE From the value of CONFIG_DEFAULT_DEVICE_TREE by default, only overriding it in the unusual cases. Though there is a lot to be said about being explicit and not mixing the two similar but not identical values. Tested on puma-rk3399. Tested-By: Vagrant CascadianWas hoping to also test on firefly-rk3399, but having difficulty getting u-boot installed unreleated to this patch. Also having troubles with firefly-rk3288 due to mmc hanging the board: https://bugs.debian.org/898520. live well, vagrant > configs/puma-rk3399_defconfig | 1 + > include/configs/rk3399_common.h | 2 +- > diff --git a/configs/puma-rk3399_defconfig b/configs/puma-rk3399_defconfig > index e6539a7da8..e5753b4f20 100644 > --- a/configs/puma-rk3399_defconfig > +++ b/configs/puma-rk3399_defconfig > @@ -16,6 +16,7 @@ CONFIG_DEBUG_UART=y > CONFIG_FIT=y > CONFIG_SPL_LOAD_FIT=y > CONFIG_SPL_FIT_SOURCE="board/theobroma-systems/puma_rk3399/fit_spl_atf.its" > +CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-puma-haikou.dtb" > # CONFIG_DISPLAY_CPUINFO is not set > CONFIG_DISPLAY_BOARDINFO_LATE=y > CONFIG_SPL_BOARD_INIT=y > diff --git a/include/configs/rk3399_common.h b/include/configs/rk3399_common.h > index a61e74bc03..ee38107ea5 100644 > --- a/include/configs/rk3399_common.h > +++ b/include/configs/rk3399_common.h > @@ -55,7 +55,7 @@ > #include > #define CONFIG_EXTRA_ENV_SETTINGS \ > ENV_MEM_LAYOUT_SETTINGS \ > - "fdtfile=rockchip/" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0" \ > + "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \ > "partitions=" PARTS_DEFAULT \ > BOOTENV > > -- > 2.11.0 signature.asc Description: PGP signature ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH v1] rockchip: utilize CONFIG_DEFAULT_FDT_FILE
Currently the fdtfile environment variable is set to CONFIG_DEFAULT_DEVICE_TREE which is іnternally used as U-Boot devicetree source. The OS can use a different filename and Kconfig gives us the ability to select a default devicetree via CONFIG_DEFAULT_FDT_FILE. This also gives user configuring U-Boot via menuconfig the behaviour someone would expect. Signed-off-by: Klaus Goger--- configs/chromebit_mickey_defconfig | 1 + configs/chromebook_jerry_defconfig | 1 + configs/chromebook_minnie_defconfig | 1 + configs/evb-px5_defconfig | 1 + configs/evb-rk3036_defconfig| 1 + configs/evb-rk3128_defconfig| 1 + configs/evb-rk3229_defconfig| 1 + configs/evb-rk3288_defconfig| 1 + configs/evb-rk3328_defconfig| 1 + configs/evb-rk3399_defconfig| 1 + configs/evb-rv1108_defconfig| 1 + configs/fennec-rk3288_defconfig | 1 + configs/firefly-rk3288_defconfig| 1 + configs/firefly-rk3399_defconfig| 1 + configs/geekbox_defconfig | 1 + configs/kylin-rk3036_defconfig | 1 + configs/lion-rk3368_defconfig | 1 + configs/miqi-rk3288_defconfig | 1 + configs/phycore-rk3288_defconfig| 1 + configs/popmetal-rk3288_defconfig | 1 + configs/puma-rk3399_defconfig | 1 + configs/rock2_defconfig | 1 + configs/rock_defconfig | 1 + configs/sheep-rk3368_defconfig | 1 + configs/tinker-rk3288_defconfig | 1 + configs/vyasa-rk3288_defconfig | 1 + include/configs/rk3036_common.h | 1 + include/configs/rk3128_common.h | 1 + include/configs/rk3188_common.h | 1 + include/configs/rk322x_common.h | 1 + include/configs/rk3288_common.h | 2 +- include/configs/rk3328_common.h | 1 + include/configs/rk3368_common.h | 1 + include/configs/rk3399_common.h | 2 +- 34 files changed, 34 insertions(+), 2 deletions(-) diff --git a/configs/chromebit_mickey_defconfig b/configs/chromebit_mickey_defconfig index d1728ef639..27b0dcaac4 100644 --- a/configs/chromebit_mickey_defconfig +++ b/configs/chromebit_mickey_defconfig @@ -11,6 +11,7 @@ CONFIG_SPL_STACK_R_ADDR=0x8 CONFIG_DEFAULT_DEVICE_TREE="rk3288-veyron-mickey" CONFIG_DEBUG_UART=y # CONFIG_ANDROID_BOOT_IMAGE is not set +CONFIG_DEFAULT_FDT_FILE="rk3288-veyron-mickey.dtb" # CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_SPL_STACK_R=y diff --git a/configs/chromebook_jerry_defconfig b/configs/chromebook_jerry_defconfig index 43d93f4637..95fe4bcb26 100644 --- a/configs/chromebook_jerry_defconfig +++ b/configs/chromebook_jerry_defconfig @@ -12,6 +12,7 @@ CONFIG_DEFAULT_DEVICE_TREE="rk3288-veyron-jerry" CONFIG_DEBUG_UART=y # CONFIG_ANDROID_BOOT_IMAGE is not set CONFIG_SILENT_CONSOLE=y +CONFIG_DEFAULT_FDT_FILE="rk3288-veyron-jerry.dtb" # CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_BOARD_EARLY_INIT_F=y diff --git a/configs/chromebook_minnie_defconfig b/configs/chromebook_minnie_defconfig index 706809ca53..bc3bb292c8 100644 --- a/configs/chromebook_minnie_defconfig +++ b/configs/chromebook_minnie_defconfig @@ -12,6 +12,7 @@ CONFIG_DEFAULT_DEVICE_TREE="rk3288-veyron-minnie" CONFIG_DEBUG_UART=y # CONFIG_ANDROID_BOOT_IMAGE is not set CONFIG_SILENT_CONSOLE=y +CONFIG_DEFAULT_FDT_FILE="rk3288-veyron-minnie.dtb" # CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_SPL_STACK_R=y diff --git a/configs/evb-px5_defconfig b/configs/evb-px5_defconfig index c03682c927..a75c3e047f 100644 --- a/configs/evb-px5_defconfig +++ b/configs/evb-px5_defconfig @@ -7,6 +7,7 @@ CONFIG_TARGET_EVB_PX5=y CONFIG_DEFAULT_DEVICE_TREE="rk3368-px5-evb" CONFIG_DEBUG_UART=y CONFIG_ANDROID_BOOT_IMAGE=y +CONFIG_DEFAULT_FDT_FILE="rockchip/rk3368-px5-evb.dtb" # CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_ARCH_EARLY_INIT_R=y diff --git a/configs/evb-rk3036_defconfig b/configs/evb-rk3036_defconfig index 33775e8cdd..840c731032 100644 --- a/configs/evb-rk3036_defconfig +++ b/configs/evb-rk3036_defconfig @@ -11,6 +11,7 @@ CONFIG_DEFAULT_DEVICE_TREE="rk3036-sdk" CONFIG_DEBUG_UART=y CONFIG_SPL_SYS_MALLOC_F_LEN=0x0 # CONFIG_ANDROID_BOOT_IMAGE is not set +CONFIG_DEFAULT_FDT_FILE="rk3036-evb.dtb" # CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y # CONFIG_SPL_FRAMEWORK is not set diff --git a/configs/evb-rk3128_defconfig b/configs/evb-rk3128_defconfig index 796d0ec92e..f4b132faf7 100644 --- a/configs/evb-rk3128_defconfig +++ b/configs/evb-rk3128_defconfig @@ -5,6 +5,7 @@ CONFIG_ROCKCHIP_RK3128=y CONFIG_DEFAULT_DEVICE_TREE="rk3128-evb" CONFIG_DEBUG_UART=y CONFIG_FIT=y +CONFIG_DEFAULT_FDT_FILE="rk3128-evb.dtb" # CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_FASTBOOT_BUF_ADDR=0x60800800 diff --git a/configs/evb-rk3229_defconfig b/configs/evb-rk3229_defconfig index 710b0b4e1a..f6cb5fd897 100644 --- a/configs/evb-rk3229_defconfig +++