Re: [ptxdist] [PATCH] treewide: remove all leftover references to "u-boot-v2"

[Roland Hieber <rhi@pengutronix.de>]

On Tue, Aug 20, 2019 at 04:27:41PM +0200, Alexander Dahl wrote:
> Hei hei,
> 
> does this affect U-Boot itself?

At least as far as I can see, ptxdist never supported a "ptxdist
menuconfig u-boot" for u-boot packages (yes, the "ptxdist u_boot_config"
option could have been named better…).  Does u-boot have a menuconfig
meanwhile? I only know that it didn't have that in the past.

 - Roland

> Greets
> Alex
> 
> Am Dienstag, 20. August 2019, 16:21:57 CEST schrieb Roland Hieber:
> > Fixes: 8def36f40f44f2cdb83c ("u-boot-v2: remove in favor of barebox")
> > Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> > ---
> >  bin/ptxdist                | 15 +--------------
> >  rules/other/Namespace.make |  1 -
> >  tests/make_uboot_v2_env    | 29 -----------------------------
> >  3 files changed, 1 insertion(+), 44 deletions(-)
> >  delete mode 100755 tests/make_uboot_v2_env
> > 
> > diff --git a/bin/ptxdist b/bin/ptxdist
> > index 343d80a7052e..d4e51a7ef15b 100755
> > --- a/bin/ptxdist
> > +++ b/bin/ptxdist
> > @@ -53,11 +53,6 @@ menu() {
> >  		menu=( "${menu[@]}"	"kernel"		"Configure Kernel (${kernel_version})" 
> )
> >  	fi
> > 
> > -	local u_boot_v2_version="$(ptxd_get_ptxconf PTXCONF_U_BOOT_V2_VERSION)"
> > -	if [ -n "${u_boot_v2_version}" ]; then
> > -		menu=( "${menu[@]}"	"u-boot-v2"		"Configure U-Boot-v2
> > (${u_boot_v2_version})" ) -	fi
> > -
> >  	local barebox_version="$(ptxd_get_ptxconf PTXCONF_BAREBOX_VERSION)"
> >  	if [ -n "${barebox_version}" ]; then
> >  		menu=( "${menu[@]}"	"barebox"		"Configure barebox ($
> {barebox_version})" )
> > @@ -113,7 +108,7 @@ menu() {
> >  		menu_select "${cmd}"
> >  		;;
> > 
> > -	ptx|platform|kernel|u-boot-v2|barebox|board|user)
> > +	ptx|platform|kernel|barebox|board|user)
> >  		do_config menuconfig "${cmd}"
> >  		# FIXME: reread user config file
> >  		;;
> > @@ -917,9 +912,6 @@ Setup and Project Actions:
> > 
> >    menuconfig barebox		configure the bootloader Barebox
> > 
> > -  menuconfig u-boot-v2
> > -  u_boot_config			configure U-Boot V2
> > -
> >    oldconfig			run 'make oldconfig' on ptxconfig file
> >    allmodconfig			run 'make allmodconfig' on ptxconfig file
> >    allyesconfig			run 'make allyesconfig' on ptxconfig file
> > @@ -1848,11 +1840,6 @@ parse_second()
> >  			exit
> >  			;;
> > 
> > -		u_boot_config)
> > -			do_config menuconfig u-boot-v2
> > -			exit
> > -			;;
> > -
> >  		boardsetup)
> >  			check_config &&
> >  			do_config menuconfig board
> > diff --git a/rules/other/Namespace.make b/rules/other/Namespace.make
> > index f15800d005fd..9b2187582aca 100644
> > --- a/rules/other/Namespace.make
> > +++ b/rules/other/Namespace.make
> > @@ -24,7 +24,6 @@ HOSTCXX				:= g++
> > 
> >  PTXCONF_ARCH_STRING		:= $(call remove_quotes, $(PTXCONF_ARCH_STRING))
> >  PTXCONF_KERNEL_ARCH_STRING	:= $(call remove_quotes,
> > $(PTXCONF_KERNEL_ARCH_STRING)) -PTXCONF_U_BOOT_V2_ARCH_STRING	:= $(call
> > remove_quotes, $(PTXCONF_U_BOOT_V2_ARCH_STRING))
> > PTXCONF_BAREBOX_ARCH_STRING	:= $(call remove_quotes,
> > $(PTXCONF_BAREBOX_ARCH_STRING))
> > 
> >  PTXCONF_TARGET_EXTRA_CFLAGS	:= $(call remove_quotes,
> > $(PTXCONF_TARGET_EXTRA_CFLAGS)) diff --git a/tests/make_uboot_v2_env
> > b/tests/make_uboot_v2_env
> > deleted file mode 100755
> > index 93d55c30e851..000000000000
> > --- a/tests/make_uboot_v2_env
> > +++ /dev/null
> > @@ -1,29 +0,0 @@
> > -#!/bin/bash
> > -
> > -set -e
> > -PTXDIST_SETENV_U_BOOT_V2_ENV="${1}"
> > -ENVTMPDIR="$(mktemp -d "${PTXDIST_TEMPDIR}/uboot_v2_env.XXXXXX")"
> > -
> > -# IMAGEDIR is not set if we are called from "ptxdist test" directly
> > -# since it comes from kwraper.
> > -[ -z "${IMAGEDIR}" ] && export IMAGEDIR=${PTXDIST_PLATFORMDIR}/images
> > -
> > -if [ ! -r ${PTXDIST_PLATFORMCONFIGDIR}/u-boot-env/config ]; then
> > -	echo "ERROR: missing valid ${PTXDIST_PLATFORMCONFIGDIR}/u-boot-env/config"
> > >&2 -	exit 1
> > -fi
> > -
> > -tar -C "${PTXDIST_PLATFORMCONFIGDIR}/u-boot-env/" -c . \
> > -	--exclude .svn \
> > -	--exclude .pc \
> > -	--exclude .git \
> > -	--exclude "config.in" \
> > -	--exclude "*/*~" \
> > -	| tar -C "${ENVTMPDIR}" -x
> > -
> > -ubootenv -s "${ENVTMPDIR}" "${IMAGEDIR}/u-boot-v2-environment"
> > -
> > -# only copy the image if we are called by "ptxdist test setenv"
> > -[ -n "${PTXDIST_SETENV_U_BOOT_V2_ENV}" ] && cp
> > "${IMAGEDIR}/u-boot-v2-environment" "${PTXDIST_SETENV_U_BOOT_V2_ENV}" -
> > -rm -rf "${ENVTMPDIR}"
> 
> 
> 
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de
> 

-- 
Roland Hieber                     | r.hieber@pengutronix.de     |
Pengutronix e.K.                  | https://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim | Phone: +49-5121-206917-5086 |
Amtsgericht Hildesheim, HRA 2686  | Fax:   +49-5121-206917-5555 |

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de