On Thu, Mar 31, 2022 at 2:24 PM Jon Mason <[email protected]> wrote: > Make the necessary changes to get tiny and preempt-rt working again, as > well as a general reorg to make things simpler. > > Signed-off-by: Jon Mason <[email protected]> > --- > .../arm-versatile-926ejs-gfx.cfg | 16 ++- > .../arm-versatile-926ejs-preempt-rt.cfg | 3 + > .../arm-versatile-926ejs-preempt-rt.scc | 6 +- > .../arm-versatile-926ejs-standard.scc | 1 - > .../arm-versatile-926ejs-tiny.scc | 1 - > .../arm-versatile-926ejs.cfg | 105 +++++++++--------- > .../arm-versatile-926ejs.scc | 9 +- > 7 files changed, 75 insertions(+), 66 deletions(-) > create mode 100644 > bsp/arm-versatile-926ejs/arm-versatile-926ejs-preempt-rt.cfg > > diff --git a/bsp/arm-versatile-926ejs/arm-versatile-926ejs-gfx.cfg > b/bsp/arm-versatile-926ejs/arm-versatile-926ejs-gfx.cfg > index 5e7519e0dfe2..83c71ae6b03e 100644 > --- a/bsp/arm-versatile-926ejs/arm-versatile-926ejs-gfx.cfg > +++ b/bsp/arm-versatile-926ejs/arm-versatile-926ejs-gfx.cfg > @@ -1,8 +1,16 @@ > # SPDX-License-Identifier: MIT > +CONFIG_INPUT=y > +CONFIG_USB_HID=y > + > +CONFIG_INPUT_MISC=y > +CONFIG_INPUT_UINPUT=y > + > +CONFIG_DRM_PANEL=y > +CONFIG_DRM_PANEL_ARM_VERSATILE=y > +CONFIG_DRM_PL111=y > + > CONFIG_FB=y > CONFIG_FB_ARMCLCD=y > -CONFIG_FRAMEBUFFER_CONSOLE=y > > -CONFIG_INPUT_TABLET=y > -CONFIG_HID_WACOM=y > -CONFIG_INPUT_MISC=y > +CONFIG_AUXDISPLAY=y > +CONFIG_ARM_CHARLCD=y > diff --git a/bsp/arm-versatile-926ejs/arm-versatile-926ejs-preempt-rt.cfg > b/bsp/arm-versatile-926ejs/arm-versatile-926ejs-preempt-rt.cfg > new file mode 100644 > index 000000000000..8d4d4e2fc53b > --- /dev/null > +++ b/bsp/arm-versatile-926ejs/arm-versatile-926ejs-preempt-rt.cfg > @@ -0,0 +1,3 @@ > +# SPDX-License-Identifier: MIT > +# CONFIG_LEDS_TRIGGER_CPU is not set > +# CONFIG_FUNCTION_GRAPH_TRACER is not set > diff --git a/bsp/arm-versatile-926ejs/arm-versatile-926ejs-preempt-rt.scc > b/bsp/arm-versatile-926ejs/arm-versatile-926ejs-preempt-rt.scc > index 8dbe0e8601f5..c1a9d34e4058 100644 > --- a/bsp/arm-versatile-926ejs/arm-versatile-926ejs-preempt-rt.scc > +++ b/bsp/arm-versatile-926ejs/arm-versatile-926ejs-preempt-rt.scc > @@ -1,10 +1,14 @@ > # SPDX-License-Identifier: MIT > define KMACHINE arm-versatile-926ejs > define KMACHINE qemuarmv5 > -define KMACHINE qemuarm > define KTYPE preempt-rt > define KARCH arm > > # no new branch required, re-use the ktypes/preempt-rt/preempt-rt.scc > branch > include ktypes/preempt-rt/preempt-rt.scc > +branch arm-versatile-926ejs > + > include arm-versatile-926ejs.scc > +kconf hardware arm-versatile-926ejs-preempt-rt.cfg > + > +patch arm_versatile_926ejs-kick-off-PrimeCell-RTC-PL031.patch > diff --git a/bsp/arm-versatile-926ejs/arm-versatile-926ejs-standard.scc > b/bsp/arm-versatile-926ejs/arm-versatile-926ejs-standard.scc > index 6edfe67bbd57..a88f385d2236 100644 > --- a/bsp/arm-versatile-926ejs/arm-versatile-926ejs-standard.scc > +++ b/bsp/arm-versatile-926ejs/arm-versatile-926ejs-standard.scc > @@ -1,7 +1,6 @@ > # SPDX-License-Identifier: MIT > define KMACHINE arm-versatile-926ejs > define KMACHINE qemuarmv5 > -define KMACHINE qemuarm > define KTYPE standard > define KARCH arm > > diff --git a/bsp/arm-versatile-926ejs/arm-versatile-926ejs-tiny.scc > b/bsp/arm-versatile-926ejs/arm-versatile-926ejs-tiny.scc > index d22969f0de5e..0fa5dae7ec99 100644 > --- a/bsp/arm-versatile-926ejs/arm-versatile-926ejs-tiny.scc > +++ b/bsp/arm-versatile-926ejs/arm-versatile-926ejs-tiny.scc > @@ -1,7 +1,6 @@ > # SPDX-License-Identifier: MIT > define KMACHINE arm-versatile-926ejs > define KMACHINE qemuarmv5 > -define KMACHINE qemuarm > define KTYPE tiny > define KARCH arm > > diff --git a/bsp/arm-versatile-926ejs/arm-versatile-926ejs.cfg > b/bsp/arm-versatile-926ejs/arm-versatile-926ejs.cfg > index 1f41220f9449..7cec7f886b9c 100644 > --- a/bsp/arm-versatile-926ejs/arm-versatile-926ejs.cfg > +++ b/bsp/arm-versatile-926ejs/arm-versatile-926ejs.cfg > @@ -1,78 +1,77 @@ > # SPDX-License-Identifier: MIT > -#......................................................................... > -# WARNING > -# > -# This file is a kernel configuration fragment, and not a full kernel > -# configuration file. The final kernel configuration is made up of > -# an assembly of processed fragments, each of which is designed to > -# capture a specific part of the final configuration (e.g. platform > -# configuration, feature configuration, and board specific hardware > -# configuration). For more information on kernel configuration, please > -# consult the product documentation. > -# > -#......................................................................... > -CONFIG_ARM=y > -CONFIG_ARM_AMBA=y > -CONFIG_CPU_ARM926T=y > -CONFIG_CPU_32v5=y >
I had a merge conflict on kernel-cache master, due to some other changes I was making .. and it caused me to have a closer look. I am curious as to why we wouldn't set CONFIG_ARM and in particular CONFIG_CPU_ARM926T, which used to be pretty fundamental to the versatile platform. Are they being selected elsewhere by the Kconfig's now or are they defaults ... or ? I didn't see them in any of the other patches, so I'm thinking I'm missing something. Bruce > +CONFIG_MMU=y > +CONFIG_ARCH_MULTIPLATFORM=y > +CONFIG_ARCH_MULTI_V7=n > +CONFIG_ARCH_MULTI_V6=n > CONFIG_ARCH_MULTI_V5=y > -# CONFIG_ARCH_MULTI_V7 is not set > -CONFIG_PCI_VERSATILE=y > -CONFIG_CPU_CACHE_VIVT=y > -CONFIG_CPU_TLB_V4WBI=y > -CONFIG_CPU_COPY_V4WB=y > -CONFIG_CPU_ABRT_EV5TJ=y > CONFIG_ARCH_VERSATILE=y > +CONFIG_PLAT_VERSATILE=y > +CONFIG_AEABI=y > +CONFIG_OABI_COMPAT=y > +CONFIG_FPE_NWFPE=y > CONFIG_VFP=y > - > -# CONFIG_PHYLIB is not set > - > +CONFIG_CMA=y > CONFIG_MTD=y > CONFIG_MTD_CMDLINE_PARTS=y > -CONFIG_MTD_BLKDEVS=y > CONFIG_MTD_BLOCK=y > CONFIG_MTD_CFI=y > -CONFIG_MTD_JEDECPROBE=y > +CONFIG_MTD_CFI_ADV_OPTIONS=y > CONFIG_MTD_CFI_INTELEXT=y > CONFIG_MTD_CFI_AMDSTD=y > +CONFIG_MTD_PHYSMAP=y > +CONFIG_MTD_PHYSMAP_OF=y > +CONFIG_MTD_PHYSMAP_VERSATILE=y > +CONFIG_I2C=y > +CONFIG_I2C_CHARDEV=y > +CONFIG_I2C_VERSATILE=y > +CONFIG_SPI=y > +CONFIG_GPIOLIB=y > +CONFIG_GPIO_PL061=y > > CONFIG_RTC_CLASS=y > CONFIG_RTC_DRV_PL031=y > +CONFIG_RTC_DRV_DS1307=y > > -# CONFIG_SERIAL_8250 is not set > -CONFIG_SERIAL_AMBA_PL011_CONSOLE=y > +CONFIG_TTY=y > +CONFIG_NULL_TTY=y > +CONFIG_VT=y > +CONFIG_VT_CONSOLE=y > +CONFIG_VT_HW_CONSOLE_BINDING=y > +CONFIG_SERIAL_8250_CONSOLE=y > +CONFIG_SERIAL_8250=y > +CONFIG_SERIAL_8250_EXTENDED=y > +CONFIG_SERIAL_8250_MANY_PORTS=y > +CONFIG_SERIAL_8250_SHARE_IRQ=y > +CONFIG_SERIAL_8250_RSA=y > CONFIG_SERIAL_AMBA_PL011=y > +CONFIG_SERIAL_AMBA_PL011_CONSOLE=y > > CONFIG_MMC=y > -CONFIG_MMC_BLOCK=y > CONFIG_MMC_ARMMMCI=y > +CONFIG_NEW_LEDS=y > +CONFIG_LEDS_CLASS=y > +CONFIG_LEDS_SYSCON=y > +CONFIG_LEDS_TRIGGERS=y > +CONFIG_LEDS_TRIGGER_HEARTBEAT=y > +CONFIG_LEDS_TRIGGER_CPU=y > +CONFIG_ARM_VIC=y > +CONFIG_ARM_TIMER_SP804=y > +CONFIG_ARM_MODULE_PLTS=y > +CONFIG_CLKSRC_VERSATILE=y > +CONFIG_POWER_RESET_VERSATILE=y > +CONFIG_VERSATILE_FPGA_IRQ=y > +CONFIG_VERSATILE_FPGA_IRQ_NR=4 > > -CONFIG_JFFS2_FS=y > -CONFIG_CRAMFS=y > +CONFIG_NET_VENDOR_SMSC=y > +CONFIG_SMC91X=y > > CONFIG_PCI=y > +CONFIG_PCI_VERSATILE=y > > -CONFIG_SCSI=y > -CONFIG_BLK_DEV_SD=y > -CONFIG_SCSI_SYM53C8XX_2=y > -CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1 > -CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16 > -CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64 > -CONFIG_SCSI_SYM53C8XX_MMIO=y > - > +CONFIG_SOUND=y > +CONFIG_SND=y > +CONFIG_SND_ARM=y > +CONFIG_SND_ARMAACI=y > > CONFIG_SERIO=y > -# CONFIG_SERIO_SERPORT is not set > CONFIG_SERIO_AMBAKMI=y > - > -CONFIG_USB_MON=y > -CONFIG_USB_OHCI_HCD=y > -CONFIG_INPUT_EVDEV=y > - > -CONFIG_FRAME_POINTER=y > - > -# CONFIG_NO_HZ is not set > -# CONFIG_HIGH_RES_TIMERS is not set > - > -CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y > -# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set > diff --git a/bsp/arm-versatile-926ejs/arm-versatile-926ejs.scc > b/bsp/arm-versatile-926ejs/arm-versatile-926ejs.scc > index 9b1ea4b43ee4..ca7b96825ff3 100644 > --- a/bsp/arm-versatile-926ejs/arm-versatile-926ejs.scc > +++ b/bsp/arm-versatile-926ejs/arm-versatile-926ejs.scc > @@ -2,11 +2,8 @@ > kconf hardware arm-versatile-926ejs.cfg > kconf hardware arm-versatile-926ejs-gfx.cfg > > -include features/profiling/profiling.scc > -include features/latencytop/latencytop.scc > - > -include features/usb/ehci-hcd.scc > -include features/usb/uhci-hcd.scc > include features/usb/ohci-hcd.scc > -include features/usb/xhci-hcd.scc > > +include features/net/net.scc > +include features/pci/pci.scc > +include cfg/virtio.scc > -- > 2.30.2 > > > > > -- - Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end - "Use the force Harry" - Gandalf, Star Trek II
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#11132): https://lists.yoctoproject.org/g/linux-yocto/message/11132 Mute This Topic: https://lists.yoctoproject.org/mt/90161234/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
