From mboxrd@z Thu Jan 1 00:00:00 1970 From: Vagrant Cascadian Date: Sun, 27 May 2018 12:16:03 -0700 Subject: [U-Boot] [PATCH v1] rockchip: utilize CONFIG_DEFAULT_FDT_FILE In-Reply-To: <20180525214505.37779-1-klaus.goger@theobroma-systems.com> References: <20180525214505.37779-1-klaus.goger@theobroma-systems.com> Message-ID: <8736ycsydo.fsf@aikidev.net> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="windows-1252" Content-Transfer-Encoding: quoted-printable To: u-boot@lists.denx.de On 2018-05-25, Klaus Goger wrote: > Currently the fdtfile environment variable is set to > CONFIG_DEFAULT_DEVICE_TREE which is =D1=96nternally used as U-Boot device= tree > 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 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=3Dy > CONFIG_FIT=3Dy > CONFIG_SPL_LOAD_FIT=3Dy > CONFIG_SPL_FIT_SOURCE=3D"board/theobroma-systems/puma_rk3399/fit_spl_atf= .its" > +CONFIG_DEFAULT_FDT_FILE=3D"rockchip/rk3399-puma-haikou.dtb" > # CONFIG_DISPLAY_CPUINFO is not set > CONFIG_DISPLAY_BOARDINFO_LATE=3Dy > CONFIG_SPL_BOARD_INIT=3Dy > diff --git a/include/configs/rk3399_common.h b/include/configs/rk3399_com= mon.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=3Drockchip/" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0" \ > + "fdtfile=3D" CONFIG_DEFAULT_FDT_FILE "\0" \ > "partitions=3D" PARTS_DEFAULT \ > BOOTENV > =20 > --=20 > 2.11.0 -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 832 bytes Desc: not available URL: