Message ID | 20220120002835.21877-5-mibodhi@gmail.com |
---|---|
State | Superseded |
Delegated to: | Stefan Roese |
Headers | show |
Series | arm: kirkwood: Add support for Pogoplug V4 | expand |
Hi Tony, On 1/20/22 01:28, Tony Dinh wrote: > Add board include header and defconfig files for Pogoplug V4 > > Signed-off-by: Tony Dinh <mibodhi@gmail.com> > --- > > Changes in v3: > - Migrate config symbols from board include header to defconfig > - Remove obsolete config symbols from header file > - Don't use ifdefs for unselectable config symbols in header file > > Changes in v2: > - Use canonical format for defconfig file > > configs/pogo_v4_defconfig | 79 +++++++++++++++++++++++++++++++++++++++ > include/configs/pogo_v4.h | 56 +++++++++++++++++++++++++++ > 2 files changed, 135 insertions(+) > create mode 100644 configs/pogo_v4_defconfig > create mode 100644 include/configs/pogo_v4.h > > diff --git a/configs/pogo_v4_defconfig b/configs/pogo_v4_defconfig > new file mode 100644 > index 0000000000..5490067b9e > --- /dev/null > +++ b/configs/pogo_v4_defconfig > @@ -0,0 +1,79 @@ > +CONFIG_ARM=y > +CONFIG_SKIP_LOWLEVEL_INIT=y > +CONFIG_SYS_DCACHE_OFF=y > +CONFIG_ARCH_CPU_INIT=y > +CONFIG_SYS_THUMB_BUILD=y > +CONFIG_ARCH_KIRKWOOD=y > +CONFIG_SYS_KWD_CONFIG="board/cloudengines/pogo_v4/kwbimage.cfg" > +CONFIG_SYS_TEXT_BASE=0x600000 > +CONFIG_TARGET_POGO_V4=y > +CONFIG_ENV_SIZE=0x20000 > +CONFIG_ENV_OFFSET=0xC0000 > +CONFIG_DEFAULT_DEVICE_TREE="kirkwood-pogoplug-series-4" > +CONFIG_IDENT_STRING="\nPogoplug V4" > +CONFIG_SYS_LOAD_ADDR=0x800000 > +CONFIG_BOOTSTAGE=y > +CONFIG_SHOW_BOOT_PROGRESS=y > +CONFIG_BOOTDELAY=10 > +CONFIG_USE_BOOTCOMMAND=y > +CONFIG_BOOTCOMMAND="setenv bootargs ${bootargs_console}; run bootcmd_usb; bootm 0x00800000 0x01100000 0x2c00000" > +CONFIG_USE_PREBOOT=y > +CONFIG_BOARD_LATE_INIT=y > +CONFIG_HUSH_PARSER=y > +CONFIG_SYS_PROMPT="Pogo_V4> " > +CONFIG_CMD_BOOTZ=y > +# CONFIG_BOOTM_PLAN9 is not set > +# CONFIG_BOOTM_RTEMS is not set > +# CONFIG_BOOTM_VXWORKS is not set > +# CONFIG_CMD_FLASH is not set > +CONFIG_CMD_MMC=y > +CONFIG_CMD_MTD=y > +CONFIG_CMD_NAND=y > +CONFIG_CMD_PCI=y > +CONFIG_CMD_SATA=y > +CONFIG_CMD_USB=y > +CONFIG_CMD_DHCP=y > +CONFIG_CMD_MII=y > +CONFIG_CMD_PING=y > +CONFIG_CMD_SNTP=y > +CONFIG_CMD_DNS=y > +CONFIG_CMD_EXT2=y > +CONFIG_CMD_EXT4=y > +CONFIG_CMD_FAT=y > +CONFIG_CMD_FS_GENERIC=y > +CONFIG_CMD_JFFS2=y > +CONFIG_CMD_MTDPARTS=y > +CONFIG_MTDIDS_DEFAULT="nand0=orion_nand" > +CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:2M(u-boot),3M(uImage),3M(uImage2),8M(failsafe),112M(root)" > +CONFIG_CMD_UBI=y > +CONFIG_ISO_PARTITION=y > +CONFIG_EFI_PARTITION=y > +CONFIG_PARTITION_TYPE_GUID=y > +CONFIG_OF_CONTROL=y > +CONFIG_ENV_OVERWRITE=y > +CONFIG_ENV_IS_IN_NAND=y > +CONFIG_VERSION_VARIABLE=y > +CONFIG_NET_RANDOM_ETHADDR=y > +CONFIG_NETCONSOLE=y > +CONFIG_DM=y > +CONFIG_SATA_MV=y > +CONFIG_KIRKWOOD_GPIO=y > +# CONFIG_MMC_HW_PARTITIONING is not set > +CONFIG_MVEBU_MMC=y > +CONFIG_MTD=y > +CONFIG_MTD_RAW_NAND=y > +CONFIG_DM_ETH=y > +CONFIG_MVGBE=y > +CONFIG_MII=y > +CONFIG_PCI=y > +CONFIG_PCI_MVEBU=y > +CONFIG_DM_RTC=y > +CONFIG_RTC_EMULATION=y > +CONFIG_SYS_NS16550=y > +CONFIG_USB=y > +CONFIG_USB_XHCI_HCD=y > +CONFIG_USB_XHCI_PCI=y > +CONFIG_USB_EHCI_HCD=y > +CONFIG_USB_STORAGE=y > +CONFIG_JFFS2_LZO=y > +CONFIG_JFFS2_NAND=y > diff --git a/include/configs/pogo_v4.h b/include/configs/pogo_v4.h > new file mode 100644 > index 0000000000..d94d49505a > --- /dev/null > +++ b/include/configs/pogo_v4.h > @@ -0,0 +1,56 @@ > +/* SPDX-License-Identifier: GPL-2.0+ */ > +/* > + * Copyright (C) 2014-2022 Tony Dinh <mibodhi@gmail.com> > + * > + * Based on > + * Copyright (C) 2012 > + * David Purdy <david.c.purdy@gmail.com> > + * > + * Based on Kirkwood support: > + * (C) Copyright 2009 > + * Marvell Semiconductor <www.marvell.com> > + * Written-by: Prafulla Wadaskar <prafulla@marvell.com> > + */ > + > +#ifndef _CONFIG_POGO_V4_H > +#define _CONFIG_POGO_V4_H > + > +/* > + * mv-common.h should be defined after CMD configs since it used them > + * to enable certain macros > + */ > +#include "mv-common.h" > + > +/* > + * Default environment variables > + */ > +#define CONFIG_EXTRA_ENV_SETTINGS \ > + "dtb_file=/boot/dts/" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0" \ > + "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0"\ > + "mtdids=nand0=orion_nand\0"\ > + "bootargs_console=console=ttyS0,115200\0" \ > + "bootcmd_usb=usb start; load usb 0:1 0x00800000 /boot/uImage; " \ > + "load usb 0:1 0x01100000 /boot/uInitrd; " \ > + "load usb 0:1 0x2c00000 $dtb_file\0" > + > +/* > + * Ethernet Driver configuration > + */ > +#ifdef CONFIG_CMD_NET Will this ever be build without CONFIG_CMD_NET? If not, then please remove the #ifdef here as well. > +#define CONFIG_FEATURE_COMMAND_EDITING /* for netconsole */ And here the main problem: [stefan@ryzen u-boot-marvell (master)]$ make pogo_v4_defconfig # # configuration written to .config # [stefan@ryzen u-boot-marvell (master)]$ make -s -j20 ===================== WARNING ====================== This board does not use CONFIG_TIMER (Driver Model for Timer drivers). Please update the board to use CONFIG_TIMER before the v2023.01 release. Failure to update by the deadline may result in board removal. See doc/driver-model/migration.rst for more info. ==================================================== Error: You must add new CONFIG options using Kconfig The following new ad-hoc CONFIG options were detected: CONFIG_FEATURE_COMMAND_EDITING Please add these via Kconfig instead. Find a suitable Kconfig file and add a 'config' or 'menuconfig' option. make: *** [Makefile:1111: .binman_stamp] Error 1 make: *** Deleting file '.binman_stamp' make: *** Waiting for unfinished jobs.... So please move this to Kconfig or remove it completely if not needed. Thanks, Stefan
Hi Stefan, On Thu, Jan 20, 2022 at 3:55 AM Stefan Roese <sr@denx.de> wrote: > > Hi Tony, > > On 1/20/22 01:28, Tony Dinh wrote: > > Add board include header and defconfig files for Pogoplug V4 > > > > Signed-off-by: Tony Dinh <mibodhi@gmail.com> > > --- > > > > Changes in v3: > > - Migrate config symbols from board include header to defconfig > > - Remove obsolete config symbols from header file > > - Don't use ifdefs for unselectable config symbols in header file > > > > Changes in v2: > > - Use canonical format for defconfig file > > > > configs/pogo_v4_defconfig | 79 +++++++++++++++++++++++++++++++++++++++ > > include/configs/pogo_v4.h | 56 +++++++++++++++++++++++++++ > > 2 files changed, 135 insertions(+) > > create mode 100644 configs/pogo_v4_defconfig > > create mode 100644 include/configs/pogo_v4.h > > > > diff --git a/configs/pogo_v4_defconfig b/configs/pogo_v4_defconfig > > new file mode 100644 > > index 0000000000..5490067b9e > > --- /dev/null > > +++ b/configs/pogo_v4_defconfig > > @@ -0,0 +1,79 @@ > > +CONFIG_ARM=y > > +CONFIG_SKIP_LOWLEVEL_INIT=y > > +CONFIG_SYS_DCACHE_OFF=y > > +CONFIG_ARCH_CPU_INIT=y > > +CONFIG_SYS_THUMB_BUILD=y > > +CONFIG_ARCH_KIRKWOOD=y > > +CONFIG_SYS_KWD_CONFIG="board/cloudengines/pogo_v4/kwbimage.cfg" > > +CONFIG_SYS_TEXT_BASE=0x600000 > > +CONFIG_TARGET_POGO_V4=y > > +CONFIG_ENV_SIZE=0x20000 > > +CONFIG_ENV_OFFSET=0xC0000 > > +CONFIG_DEFAULT_DEVICE_TREE="kirkwood-pogoplug-series-4" > > +CONFIG_IDENT_STRING="\nPogoplug V4" > > +CONFIG_SYS_LOAD_ADDR=0x800000 > > +CONFIG_BOOTSTAGE=y > > +CONFIG_SHOW_BOOT_PROGRESS=y > > +CONFIG_BOOTDELAY=10 > > +CONFIG_USE_BOOTCOMMAND=y > > +CONFIG_BOOTCOMMAND="setenv bootargs ${bootargs_console}; run bootcmd_usb; bootm 0x00800000 0x01100000 0x2c00000" > > +CONFIG_USE_PREBOOT=y > > +CONFIG_BOARD_LATE_INIT=y > > +CONFIG_HUSH_PARSER=y > > +CONFIG_SYS_PROMPT="Pogo_V4> " > > +CONFIG_CMD_BOOTZ=y > > +# CONFIG_BOOTM_PLAN9 is not set > > +# CONFIG_BOOTM_RTEMS is not set > > +# CONFIG_BOOTM_VXWORKS is not set > > +# CONFIG_CMD_FLASH is not set > > +CONFIG_CMD_MMC=y > > +CONFIG_CMD_MTD=y > > +CONFIG_CMD_NAND=y > > +CONFIG_CMD_PCI=y > > +CONFIG_CMD_SATA=y > > +CONFIG_CMD_USB=y > > +CONFIG_CMD_DHCP=y > > +CONFIG_CMD_MII=y > > +CONFIG_CMD_PING=y > > +CONFIG_CMD_SNTP=y > > +CONFIG_CMD_DNS=y > > +CONFIG_CMD_EXT2=y > > +CONFIG_CMD_EXT4=y > > +CONFIG_CMD_FAT=y > > +CONFIG_CMD_FS_GENERIC=y > > +CONFIG_CMD_JFFS2=y > > +CONFIG_CMD_MTDPARTS=y > > +CONFIG_MTDIDS_DEFAULT="nand0=orion_nand" > > +CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:2M(u-boot),3M(uImage),3M(uImage2),8M(failsafe),112M(root)" > > +CONFIG_CMD_UBI=y > > +CONFIG_ISO_PARTITION=y > > +CONFIG_EFI_PARTITION=y > > +CONFIG_PARTITION_TYPE_GUID=y > > +CONFIG_OF_CONTROL=y > > +CONFIG_ENV_OVERWRITE=y > > +CONFIG_ENV_IS_IN_NAND=y > > +CONFIG_VERSION_VARIABLE=y > > +CONFIG_NET_RANDOM_ETHADDR=y > > +CONFIG_NETCONSOLE=y > > +CONFIG_DM=y > > +CONFIG_SATA_MV=y > > +CONFIG_KIRKWOOD_GPIO=y > > +# CONFIG_MMC_HW_PARTITIONING is not set > > +CONFIG_MVEBU_MMC=y > > +CONFIG_MTD=y > > +CONFIG_MTD_RAW_NAND=y > > +CONFIG_DM_ETH=y > > +CONFIG_MVGBE=y > > +CONFIG_MII=y > > +CONFIG_PCI=y > > +CONFIG_PCI_MVEBU=y > > +CONFIG_DM_RTC=y > > +CONFIG_RTC_EMULATION=y > > +CONFIG_SYS_NS16550=y > > +CONFIG_USB=y > > +CONFIG_USB_XHCI_HCD=y > > +CONFIG_USB_XHCI_PCI=y > > +CONFIG_USB_EHCI_HCD=y > > +CONFIG_USB_STORAGE=y > > +CONFIG_JFFS2_LZO=y > > +CONFIG_JFFS2_NAND=y > > diff --git a/include/configs/pogo_v4.h b/include/configs/pogo_v4.h > > new file mode 100644 > > index 0000000000..d94d49505a > > --- /dev/null > > +++ b/include/configs/pogo_v4.h > > @@ -0,0 +1,56 @@ > > +/* SPDX-License-Identifier: GPL-2.0+ */ > > +/* > > + * Copyright (C) 2014-2022 Tony Dinh <mibodhi@gmail.com> > > + * > > + * Based on > > + * Copyright (C) 2012 > > + * David Purdy <david.c.purdy@gmail.com> > > + * > > + * Based on Kirkwood support: > > + * (C) Copyright 2009 > > + * Marvell Semiconductor <www.marvell.com> > > + * Written-by: Prafulla Wadaskar <prafulla@marvell.com> > > + */ > > + > > +#ifndef _CONFIG_POGO_V4_H > > +#define _CONFIG_POGO_V4_H > > + > > +/* > > + * mv-common.h should be defined after CMD configs since it used them > > + * to enable certain macros > > + */ > > +#include "mv-common.h" > > + > > +/* > > + * Default environment variables > > + */ > > +#define CONFIG_EXTRA_ENV_SETTINGS \ > > + "dtb_file=/boot/dts/" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0" \ > > + "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0"\ > > + "mtdids=nand0=orion_nand\0"\ > > + "bootargs_console=console=ttyS0,115200\0" \ > > + "bootcmd_usb=usb start; load usb 0:1 0x00800000 /boot/uImage; " \ > > + "load usb 0:1 0x01100000 /boot/uInitrd; " \ > > + "load usb 0:1 0x2c00000 $dtb_file\0" > > + > > +/* > > + * Ethernet Driver configuration > > + */ > > +#ifdef CONFIG_CMD_NET > > Will this ever be build without CONFIG_CMD_NET? If not, then please > remove the #ifdef here as well. > > > +#define CONFIG_FEATURE_COMMAND_EDITING /* for netconsole */ > > And here the main problem: > > [stefan@ryzen u-boot-marvell (master)]$ make pogo_v4_defconfig > # > # configuration written to .config > # > [stefan@ryzen u-boot-marvell (master)]$ make -s -j20 > ===================== WARNING ====================== > This board does not use CONFIG_TIMER (Driver Model > for Timer drivers). Please update the board to use > CONFIG_TIMER before the v2023.01 release. Failure to > update by the deadline may result in board removal. > See doc/driver-model/migration.rst for more info. > ==================================================== > Error: You must add new CONFIG options using Kconfig > The following new ad-hoc CONFIG options were detected: > CONFIG_FEATURE_COMMAND_EDITING > > Please add these via Kconfig instead. Find a suitable Kconfig > file and add a 'config' or 'menuconfig' option. > make: *** [Makefile:1111: .binman_stamp] Error 1 > make: *** Deleting file '.binman_stamp' > make: *** Waiting for unfinished jobs.... > > So please move this to Kconfig or remove it completely if not needed. Sorry about that. Pretty strange that it built fine in my tree (tracking master). I did not see the error. I also use Tom's script to check for unmigrate symbols. And this CONFIG_FEATURE_COMMAND_EDITING did not show up on the list. The script is from this post: https://lists.denx.de/pipermail/u-boot/2021-September/460085.html I'll remove it for now. Thanks, Tony > Thanks, > Stefan
diff --git a/configs/pogo_v4_defconfig b/configs/pogo_v4_defconfig new file mode 100644 index 0000000000..5490067b9e --- /dev/null +++ b/configs/pogo_v4_defconfig @@ -0,0 +1,79 @@ +CONFIG_ARM=y +CONFIG_SKIP_LOWLEVEL_INIT=y +CONFIG_SYS_DCACHE_OFF=y +CONFIG_ARCH_CPU_INIT=y +CONFIG_SYS_THUMB_BUILD=y +CONFIG_ARCH_KIRKWOOD=y +CONFIG_SYS_KWD_CONFIG="board/cloudengines/pogo_v4/kwbimage.cfg" +CONFIG_SYS_TEXT_BASE=0x600000 +CONFIG_TARGET_POGO_V4=y +CONFIG_ENV_SIZE=0x20000 +CONFIG_ENV_OFFSET=0xC0000 +CONFIG_DEFAULT_DEVICE_TREE="kirkwood-pogoplug-series-4" +CONFIG_IDENT_STRING="\nPogoplug V4" +CONFIG_SYS_LOAD_ADDR=0x800000 +CONFIG_BOOTSTAGE=y +CONFIG_SHOW_BOOT_PROGRESS=y +CONFIG_BOOTDELAY=10 +CONFIG_USE_BOOTCOMMAND=y +CONFIG_BOOTCOMMAND="setenv bootargs ${bootargs_console}; run bootcmd_usb; bootm 0x00800000 0x01100000 0x2c00000" +CONFIG_USE_PREBOOT=y +CONFIG_BOARD_LATE_INIT=y +CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="Pogo_V4> " +CONFIG_CMD_BOOTZ=y +# CONFIG_BOOTM_PLAN9 is not set +# CONFIG_BOOTM_RTEMS is not set +# CONFIG_BOOTM_VXWORKS is not set +# CONFIG_CMD_FLASH is not set +CONFIG_CMD_MMC=y +CONFIG_CMD_MTD=y +CONFIG_CMD_NAND=y +CONFIG_CMD_PCI=y +CONFIG_CMD_SATA=y +CONFIG_CMD_USB=y +CONFIG_CMD_DHCP=y +CONFIG_CMD_MII=y +CONFIG_CMD_PING=y +CONFIG_CMD_SNTP=y +CONFIG_CMD_DNS=y +CONFIG_CMD_EXT2=y +CONFIG_CMD_EXT4=y +CONFIG_CMD_FAT=y +CONFIG_CMD_FS_GENERIC=y +CONFIG_CMD_JFFS2=y +CONFIG_CMD_MTDPARTS=y +CONFIG_MTDIDS_DEFAULT="nand0=orion_nand" +CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:2M(u-boot),3M(uImage),3M(uImage2),8M(failsafe),112M(root)" +CONFIG_CMD_UBI=y +CONFIG_ISO_PARTITION=y +CONFIG_EFI_PARTITION=y +CONFIG_PARTITION_TYPE_GUID=y +CONFIG_OF_CONTROL=y +CONFIG_ENV_OVERWRITE=y +CONFIG_ENV_IS_IN_NAND=y +CONFIG_VERSION_VARIABLE=y +CONFIG_NET_RANDOM_ETHADDR=y +CONFIG_NETCONSOLE=y +CONFIG_DM=y +CONFIG_SATA_MV=y +CONFIG_KIRKWOOD_GPIO=y +# CONFIG_MMC_HW_PARTITIONING is not set +CONFIG_MVEBU_MMC=y +CONFIG_MTD=y +CONFIG_MTD_RAW_NAND=y +CONFIG_DM_ETH=y +CONFIG_MVGBE=y +CONFIG_MII=y +CONFIG_PCI=y +CONFIG_PCI_MVEBU=y +CONFIG_DM_RTC=y +CONFIG_RTC_EMULATION=y +CONFIG_SYS_NS16550=y +CONFIG_USB=y +CONFIG_USB_XHCI_HCD=y +CONFIG_USB_XHCI_PCI=y +CONFIG_USB_EHCI_HCD=y +CONFIG_USB_STORAGE=y +CONFIG_JFFS2_LZO=y +CONFIG_JFFS2_NAND=y diff --git a/include/configs/pogo_v4.h b/include/configs/pogo_v4.h new file mode 100644 index 0000000000..d94d49505a --- /dev/null +++ b/include/configs/pogo_v4.h @@ -0,0 +1,56 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* + * Copyright (C) 2014-2022 Tony Dinh <mibodhi@gmail.com> + * + * Based on + * Copyright (C) 2012 + * David Purdy <david.c.purdy@gmail.com> + * + * Based on Kirkwood support: + * (C) Copyright 2009 + * Marvell Semiconductor <www.marvell.com> + * Written-by: Prafulla Wadaskar <prafulla@marvell.com> + */ + +#ifndef _CONFIG_POGO_V4_H +#define _CONFIG_POGO_V4_H + +/* + * mv-common.h should be defined after CMD configs since it used them + * to enable certain macros + */ +#include "mv-common.h" + +/* + * Default environment variables + */ +#define CONFIG_EXTRA_ENV_SETTINGS \ + "dtb_file=/boot/dts/" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0" \ + "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0"\ + "mtdids=nand0=orion_nand\0"\ + "bootargs_console=console=ttyS0,115200\0" \ + "bootcmd_usb=usb start; load usb 0:1 0x00800000 /boot/uImage; " \ + "load usb 0:1 0x01100000 /boot/uInitrd; " \ + "load usb 0:1 0x2c00000 $dtb_file\0" + +/* + * Ethernet Driver configuration + */ +#ifdef CONFIG_CMD_NET +#define CONFIG_FEATURE_COMMAND_EDITING /* for netconsole */ +#define CONFIG_MVGBE_PORTS {1, 0} /* enable port 0 only */ +#define CONFIG_PHY_BASE_ADR 0 +#endif /* CONFIG_CMD_NET */ + +/* + * SATA Driver configuration + */ +#define CONFIG_SYS_SATA_MAX_DEVICE 1 + +/* + * Support large disk for SATA and USB + */ +#define CONFIG_SYS_64BIT_LBA +#define CONFIG_LBA48 + +#endif /* _CONFIG_POGO_V4_H */
Add board include header and defconfig files for Pogoplug V4 Signed-off-by: Tony Dinh <mibodhi@gmail.com> --- Changes in v3: - Migrate config symbols from board include header to defconfig - Remove obsolete config symbols from header file - Don't use ifdefs for unselectable config symbols in header file Changes in v2: - Use canonical format for defconfig file configs/pogo_v4_defconfig | 79 +++++++++++++++++++++++++++++++++++++++ include/configs/pogo_v4.h | 56 +++++++++++++++++++++++++++ 2 files changed, 135 insertions(+) create mode 100644 configs/pogo_v4_defconfig create mode 100644 include/configs/pogo_v4.h