diff mbox series

[v2,1/1] configs/warpboard: remove defconfig

Message ID 20240413195612.11925-1-ju.o@free.fr
State Accepted
Headers show
Series [v2,1/1] configs/warpboard: remove defconfig | expand

Commit Message

Julien Olivain April 13, 2024, 7:56 p.m. UTC
As suggested by Fabio in [1], this commit removes the defconfig and all
other associated files.

The U-Boot support for the Warpboard has been removed upstream in
commit [2], first included in version 2022.10.

For reference, at the time of this commit, the latest Kernel is 6.8.6
and still has support for this board. See [3].

The reason of this removal is because this defconfig fail to build with
recent toolchains. See [4].

Fixes: [4]

[1] https://lists.buildroot.org/pipermail/buildroot/2024-April/689596.html
[2] https://source.denx.de/u-boot/u-boot/-/commit/c50ff4a933d5617415221bbb85b0bfa5247b697a
[3] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/tree/arch/arm/boot/dts/nxp/imx/imx6sl-warp.dts?h=v6.8.6
[4] https://gitlab.com/buildroot.org/buildroot/-/jobs/6609466749

Suggested-by: Fabio Estevam <festevam@gmail.com>
Signed-off-by: Julien Olivain <ju.o@free.fr>
---
Changes v1 -> v2:
- The v2 totally removes the defconfig and associated files, whereas
  the v1 was fixing the build issue by bumping component the last
  known supported versions of upstream.
---
 DEVELOPERS                                    |  2 -
 board/freescale/warpboard/README              | 77 -------------------
 board/freescale/warpboard/linux.fragment      |  1 -
 .../lib/firmware/brcm/brcmfmac4330-sdio.txt   | 40 ----------
 configs/warpboard_defconfig                   | 58 --------------
 5 files changed, 178 deletions(-)
 delete mode 100644 board/freescale/warpboard/README
 delete mode 100644 board/freescale/warpboard/linux.fragment
 delete mode 100644 board/freescale/warpboard/rootfs_overlay/lib/firmware/brcm/brcmfmac4330-sdio.txt
 delete mode 100644 configs/warpboard_defconfig

Comments

Fabio Estevam April 14, 2024, 10:24 p.m. UTC | #1
Hi Julien,

On Sat, Apr 13, 2024 at 4:56 PM Julien Olivain <ju.o@free.fr> wrote:
>
> As suggested by Fabio in [1], this commit removes the defconfig and all
> other associated files.
>
> The U-Boot support for the Warpboard has been removed upstream in
> commit [2], first included in version 2022.10.
>
> For reference, at the time of this commit, the latest Kernel is 6.8.6
> and still has support for this board. See [3].
>
> The reason of this removal is because this defconfig fail to build with
> recent toolchains. See [4].
>
> Fixes: [4]
>
> [1] https://lists.buildroot.org/pipermail/buildroot/2024-April/689596.html
> [2] https://source.denx.de/u-boot/u-boot/-/commit/c50ff4a933d5617415221bbb85b0bfa5247b697a
> [3] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/tree/arch/arm/boot/dts/nxp/imx/imx6sl-warp.dts?h=v6.8.6
> [4] https://gitlab.com/buildroot.org/buildroot/-/jobs/6609466749
>
> Suggested-by: Fabio Estevam <festevam@gmail.com>
> Signed-off-by: Julien Olivain <ju.o@free.fr>

Yes, let's remove it as I don't have access to this board anymore, thanks.

Reviewed-by: Fabio Estevam <festevam@gmail.com>
Arnout Vandecappelle April 28, 2024, 6:09 p.m. UTC | #2
On 13/04/2024 21:56, Julien Olivain wrote:
> As suggested by Fabio in [1], this commit removes the defconfig and all
> other associated files.
> 
> The U-Boot support for the Warpboard has been removed upstream in
> commit [2], first included in version 2022.10.
> 
> For reference, at the time of this commit, the latest Kernel is 6.8.6
> and still has support for this board. See [3].
> 
> The reason of this removal is because this defconfig fail to build with
> recent toolchains. See [4].
> 
> Fixes: [4]
> 
> [1] https://lists.buildroot.org/pipermail/buildroot/2024-April/689596.html
> [2] https://source.denx.de/u-boot/u-boot/-/commit/c50ff4a933d5617415221bbb85b0bfa5247b697a
> [3] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/tree/arch/arm/boot/dts/nxp/imx/imx6sl-warp.dts?h=v6.8.6
> [4] https://gitlab.com/buildroot.org/buildroot/-/jobs/6609466749
> 
> Suggested-by: Fabio Estevam <festevam@gmail.com>
> Signed-off-by: Julien Olivain <ju.o@free.fr>

  Applied to master, thanks.

  Regards,
  Arnout

> ---
> Changes v1 -> v2:
> - The v2 totally removes the defconfig and associated files, whereas
>    the v1 was fixing the build issue by bumping component the last
>    known supported versions of upstream.
> ---
>   DEVELOPERS                                    |  2 -
>   board/freescale/warpboard/README              | 77 -------------------
>   board/freescale/warpboard/linux.fragment      |  1 -
>   .../lib/firmware/brcm/brcmfmac4330-sdio.txt   | 40 ----------
>   configs/warpboard_defconfig                   | 58 --------------
>   5 files changed, 178 deletions(-)
>   delete mode 100644 board/freescale/warpboard/README
>   delete mode 100644 board/freescale/warpboard/linux.fragment
>   delete mode 100644 board/freescale/warpboard/rootfs_overlay/lib/firmware/brcm/brcmfmac4330-sdio.txt
>   delete mode 100644 configs/warpboard_defconfig
> 
> diff --git a/DEVELOPERS b/DEVELOPERS
> index 399b2931ff3..4d10e3dbacd 100644
> --- a/DEVELOPERS
> +++ b/DEVELOPERS
> @@ -942,7 +942,6 @@ F:	package/openbox/
>   F:	package/supertuxkart/
>   
>   N:	Fabio Estevam <festevam@gmail.com>
> -F:	board/freescale/warpboard/
>   F:	board/warp7/
>   F:	configs/freescale_imx*
>   F:	configs/imx23evk_defconfig
> @@ -963,7 +962,6 @@ F:	configs/mx6sx_udoo_neo_defconfig
>   F:	configs/mx6udoo_defconfig
>   F:	configs/wandboard_defconfig
>   F:	configs/warp7_defconfig
> -F:	configs/warpboard_defconfig
>   F:	package/atest/
>   F:	package/crucible/
>   F:	package/kmscube/
> diff --git a/board/freescale/warpboard/README b/board/freescale/warpboard/README
> deleted file mode 100644
> index 67d4e044e98..00000000000
> --- a/board/freescale/warpboard/README
> +++ /dev/null
> @@ -1,77 +0,0 @@
> -Build
> -=====
> -
> -First, configure Buildroot for your WarpBoard.
> -  make warpboard_defconfig
> -
> -Build all components:
> -  make
> -
> -You will find in ./output/images/ the following files:
> -  - imx6sl-warp.dtb
> -  - rootfs.ext4
> -  - rootfs.tar
> -  - sdcard.img
> -  - u-boot.imx
> -  - zImage
> -
> -Update uboot
> -============
> -
> -- Put warpboard in USB download mode by closing the j2 jumper on the
> -  daugther board
> -
> -- Load u-boot.imx in the WarpBoard by using the imx-usb-loader host utility:
> -
> -  $ ./output/host/bin/imx_usb -c output/host/etc/imx-loader.d/ output/images/u-boot.imx
> -
> -- U-Boot will appear in minicom
> -
> -- Reset the U-Boot environment to its default:
> - => env default -f -a
> - => saveenv
> -
> -- Run the DFU command in U-Boot:
> - => dfu 0 mmc 0
> -
> -- Transfer U-Boot into flash by running this command in host side:
> -
> - $ sudo ./output/host/bin/dfu-util -D output/images/u-boot.imx -a boot
> -
> -- remove power and put the WarpBoard back into normal boot mode by
> -  opening the j2 jumper.
> -
> -Update linux & rootfs
> -=====================
> -
> -Run the 'ums' command from the U-Boot prompt to mount the eMMC as USB mass
> -storage:
> -
> -=> ums 0 mmc 0
> -
> -And then flash the sdcard.img into the eMMC:
> -
> -  dd if=output/images/sdcard.img of=/dev/<your-sd-device>
> -
> -*** WARNING! This will destroy all the eMMC content. Use it with care! ***
> -
> -Using bluetooth
> -================
> -
> -Enable the bluez_utils or bluez5_utils package, and then run:
> -
> -$ hciattach /dev/ttymxc4 any
> -$ hciconfig hci0 up
> -
> -Using Wifi
> -==========
> -
> -# modprobe brcmfmac
> -# iwconfig wlan0 essid ACCESSPOINTNAME
> -# wpa_passphrase ACCESSPOINTNAME > /etc/wpa.conf
> -(enter the wifi password and press enter)
> -# wpa_supplicant -Dwext -iwlan0 -c /etc/wpa.conf &
> -# udhcpc -i wlan0
> -# ping buildroot.org
> -
> -Enjoy!
> diff --git a/board/freescale/warpboard/linux.fragment b/board/freescale/warpboard/linux.fragment
> deleted file mode 100644
> index 892d0cb7b99..00000000000
> --- a/board/freescale/warpboard/linux.fragment
> +++ /dev/null
> @@ -1 +0,0 @@
> -CONFIG_CFG80211_WEXT=y
> diff --git a/board/freescale/warpboard/rootfs_overlay/lib/firmware/brcm/brcmfmac4330-sdio.txt b/board/freescale/warpboard/rootfs_overlay/lib/firmware/brcm/brcmfmac4330-sdio.txt
> deleted file mode 100644
> index 9546246b918..00000000000
> --- a/board/freescale/warpboard/rootfs_overlay/lib/firmware/brcm/brcmfmac4330-sdio.txt
> +++ /dev/null
> @@ -1,40 +0,0 @@
> -# bcm94330wlsdgb.txt
> -manfid=0x2d0
> -prodid=0x0552
> -vendid=0x14e4
> -devid=0x4360
> -boardtype=0x0552
> -boardrev=0x11
> -# this design has 2.4GHz SP3T switch
> -boardflags=0x00080200
> -nocrc=1
> -xtalfreq=37400
> -boardnum=22
> -macaddr=00:90:4c:c5:12:38
> -ag0=255
> -aa2g=1
> -ccode=CN
> -pa0b0=0x14d0
> -pa0b1=0xfd98
> -pa0b2=0xff78
> -rssismf2g=0xa
> -rssismc2g=0x3
> -rssisav2g=0x7
> -maxp2ga0=0x50
> -sromrev=3
> -il0macaddr=00:90:4c:c5:12:38
> -wl0id=0x431b
> -cckPwrOffset=5
> -ofdm2gpo=0x66666666
> -mcs2gpo0=0x6666
> -mcs2gpo1=0x6666
> -swctrlmap_2g=0x04040404,0x02020202,0x02020404,0x10202,0x1ff
> -swctrlmap_5g=0x00100010,0x00280020,0x00200010,0x14202,0x2f8
> -rfreg033=0x19
> -rfreg033_cck=0x1f
> -dacrate2g=160
> -txalpfbyp2g=1
> -bphyscale=17
> -cckPwrIdxCorr=-15
> -pacalidx2g=45
> -txgaintbl=1
> diff --git a/configs/warpboard_defconfig b/configs/warpboard_defconfig
> deleted file mode 100644
> index 1655381aa63..00000000000
> --- a/configs/warpboard_defconfig
> +++ /dev/null
> @@ -1,58 +0,0 @@
> -# architecture
> -BR2_arm=y
> -BR2_cortex_a9=y
> -BR2_ARM_ENABLE_NEON=y
> -BR2_ARM_ENABLE_VFP=y
> -BR2_ARM_FPU_VFPV3=y
> -
> -# Linux headers same as kernel, a 4.9 series
> -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y
> -
> -# system
> -BR2_TARGET_GENERIC_HOSTNAME="warpboard"
> -BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0"
> -
> -# rootfs overlay
> -BR2_ROOTFS_OVERLAY="board/freescale/warpboard/rootfs_overlay"
> -
> -# kernel
> -BR2_LINUX_KERNEL=y
> -BR2_LINUX_KERNEL_CUSTOM_VERSION=y
> -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.9"
> -BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7"
> -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/freescale/warpboard/linux.fragment"
> -BR2_LINUX_KERNEL_DTS_SUPPORT=y
> -BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6sl-warp"
> -
> -# wifi firmware for brcm4330
> -BR2_PACKAGE_LINUX_FIRMWARE=y
> -BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XX=y
> -
> -# For automatic firmware loading
> -BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y
> -
> -# wireless packages
> -BR2_PACKAGE_WIRELESS_TOOLS=y
> -BR2_PACKAGE_WPA_SUPPLICANT=y
> -BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y
> -
> -# uboot
> -BR2_TARGET_UBOOT=y
> -BR2_TARGET_UBOOT_BOARDNAME="warp"
> -BR2_TARGET_UBOOT_CUSTOM_VERSION=y
> -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2016.11"
> -BR2_TARGET_UBOOT_FORMAT_IMX=y
> -
> -# host utility
> -BR2_PACKAGE_HOST_DFU_UTIL=y
> -BR2_PACKAGE_HOST_IMX_USB_LOADER=y
> -
> -# Filesystem
> -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh"
> -BR2_TARGET_ROOTFS_EXT2=y
> -BR2_TARGET_ROOTFS_EXT2_4=y
> -
> -# required tools to create the eMMC image
> -BR2_PACKAGE_HOST_DOSFSTOOLS=y
> -BR2_PACKAGE_HOST_GENIMAGE=y
> -BR2_PACKAGE_HOST_MTOOLS=y
diff mbox series

Patch

diff --git a/DEVELOPERS b/DEVELOPERS
index 399b2931ff3..4d10e3dbacd 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -942,7 +942,6 @@  F:	package/openbox/
 F:	package/supertuxkart/
 
 N:	Fabio Estevam <festevam@gmail.com>
-F:	board/freescale/warpboard/
 F:	board/warp7/
 F:	configs/freescale_imx*
 F:	configs/imx23evk_defconfig
@@ -963,7 +962,6 @@  F:	configs/mx6sx_udoo_neo_defconfig
 F:	configs/mx6udoo_defconfig
 F:	configs/wandboard_defconfig
 F:	configs/warp7_defconfig
-F:	configs/warpboard_defconfig
 F:	package/atest/
 F:	package/crucible/
 F:	package/kmscube/
diff --git a/board/freescale/warpboard/README b/board/freescale/warpboard/README
deleted file mode 100644
index 67d4e044e98..00000000000
--- a/board/freescale/warpboard/README
+++ /dev/null
@@ -1,77 +0,0 @@ 
-Build
-=====
-
-First, configure Buildroot for your WarpBoard.
-  make warpboard_defconfig
-
-Build all components:
-  make
-
-You will find in ./output/images/ the following files:
-  - imx6sl-warp.dtb
-  - rootfs.ext4
-  - rootfs.tar
-  - sdcard.img
-  - u-boot.imx
-  - zImage
-
-Update uboot
-============
-
-- Put warpboard in USB download mode by closing the j2 jumper on the
-  daugther board
-
-- Load u-boot.imx in the WarpBoard by using the imx-usb-loader host utility:
-
-  $ ./output/host/bin/imx_usb -c output/host/etc/imx-loader.d/ output/images/u-boot.imx
-
-- U-Boot will appear in minicom
-
-- Reset the U-Boot environment to its default:
- => env default -f -a
- => saveenv
-
-- Run the DFU command in U-Boot:
- => dfu 0 mmc 0
-
-- Transfer U-Boot into flash by running this command in host side:
-
- $ sudo ./output/host/bin/dfu-util -D output/images/u-boot.imx -a boot
-
-- remove power and put the WarpBoard back into normal boot mode by
-  opening the j2 jumper.
-
-Update linux & rootfs
-=====================
-
-Run the 'ums' command from the U-Boot prompt to mount the eMMC as USB mass
-storage:
-
-=> ums 0 mmc 0
-
-And then flash the sdcard.img into the eMMC:
-
-  dd if=output/images/sdcard.img of=/dev/<your-sd-device>
-
-*** WARNING! This will destroy all the eMMC content. Use it with care! ***
-
-Using bluetooth
-================
-
-Enable the bluez_utils or bluez5_utils package, and then run:
-
-$ hciattach /dev/ttymxc4 any
-$ hciconfig hci0 up
-
-Using Wifi
-==========
-
-# modprobe brcmfmac
-# iwconfig wlan0 essid ACCESSPOINTNAME
-# wpa_passphrase ACCESSPOINTNAME > /etc/wpa.conf
-(enter the wifi password and press enter)
-# wpa_supplicant -Dwext -iwlan0 -c /etc/wpa.conf &
-# udhcpc -i wlan0
-# ping buildroot.org
-
-Enjoy!
diff --git a/board/freescale/warpboard/linux.fragment b/board/freescale/warpboard/linux.fragment
deleted file mode 100644
index 892d0cb7b99..00000000000
--- a/board/freescale/warpboard/linux.fragment
+++ /dev/null
@@ -1 +0,0 @@ 
-CONFIG_CFG80211_WEXT=y
diff --git a/board/freescale/warpboard/rootfs_overlay/lib/firmware/brcm/brcmfmac4330-sdio.txt b/board/freescale/warpboard/rootfs_overlay/lib/firmware/brcm/brcmfmac4330-sdio.txt
deleted file mode 100644
index 9546246b918..00000000000
--- a/board/freescale/warpboard/rootfs_overlay/lib/firmware/brcm/brcmfmac4330-sdio.txt
+++ /dev/null
@@ -1,40 +0,0 @@ 
-# bcm94330wlsdgb.txt
-manfid=0x2d0
-prodid=0x0552
-vendid=0x14e4
-devid=0x4360
-boardtype=0x0552
-boardrev=0x11
-# this design has 2.4GHz SP3T switch
-boardflags=0x00080200
-nocrc=1
-xtalfreq=37400
-boardnum=22
-macaddr=00:90:4c:c5:12:38
-ag0=255
-aa2g=1
-ccode=CN
-pa0b0=0x14d0
-pa0b1=0xfd98
-pa0b2=0xff78
-rssismf2g=0xa
-rssismc2g=0x3
-rssisav2g=0x7
-maxp2ga0=0x50
-sromrev=3
-il0macaddr=00:90:4c:c5:12:38
-wl0id=0x431b
-cckPwrOffset=5
-ofdm2gpo=0x66666666
-mcs2gpo0=0x6666
-mcs2gpo1=0x6666
-swctrlmap_2g=0x04040404,0x02020202,0x02020404,0x10202,0x1ff
-swctrlmap_5g=0x00100010,0x00280020,0x00200010,0x14202,0x2f8
-rfreg033=0x19
-rfreg033_cck=0x1f
-dacrate2g=160
-txalpfbyp2g=1
-bphyscale=17
-cckPwrIdxCorr=-15
-pacalidx2g=45
-txgaintbl=1
diff --git a/configs/warpboard_defconfig b/configs/warpboard_defconfig
deleted file mode 100644
index 1655381aa63..00000000000
--- a/configs/warpboard_defconfig
+++ /dev/null
@@ -1,58 +0,0 @@ 
-# architecture
-BR2_arm=y
-BR2_cortex_a9=y
-BR2_ARM_ENABLE_NEON=y
-BR2_ARM_ENABLE_VFP=y
-BR2_ARM_FPU_VFPV3=y
-
-# Linux headers same as kernel, a 4.9 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y
-
-# system
-BR2_TARGET_GENERIC_HOSTNAME="warpboard"
-BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0"
-
-# rootfs overlay
-BR2_ROOTFS_OVERLAY="board/freescale/warpboard/rootfs_overlay"
-
-# kernel
-BR2_LINUX_KERNEL=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.9"
-BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7"
-BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/freescale/warpboard/linux.fragment"
-BR2_LINUX_KERNEL_DTS_SUPPORT=y
-BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6sl-warp"
-
-# wifi firmware for brcm4330
-BR2_PACKAGE_LINUX_FIRMWARE=y
-BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XX=y
-
-# For automatic firmware loading
-BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y
-
-# wireless packages
-BR2_PACKAGE_WIRELESS_TOOLS=y
-BR2_PACKAGE_WPA_SUPPLICANT=y
-BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y
-
-# uboot
-BR2_TARGET_UBOOT=y
-BR2_TARGET_UBOOT_BOARDNAME="warp"
-BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2016.11"
-BR2_TARGET_UBOOT_FORMAT_IMX=y
-
-# host utility
-BR2_PACKAGE_HOST_DFU_UTIL=y
-BR2_PACKAGE_HOST_IMX_USB_LOADER=y
-
-# Filesystem
-BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh"
-BR2_TARGET_ROOTFS_EXT2=y
-BR2_TARGET_ROOTFS_EXT2_4=y
-
-# required tools to create the eMMC image
-BR2_PACKAGE_HOST_DOSFSTOOLS=y
-BR2_PACKAGE_HOST_GENIMAGE=y
-BR2_PACKAGE_HOST_MTOOLS=y