diff options
| author | Nathan Rossi <nathan.rossi@xilinx.com> | 2015-03-09 14:43:52 +1000 |
|---|---|---|
| committer | Nathan Rossi <nathan.rossi@xilinx.com> | 2015-03-31 15:56:48 +1000 |
| commit | 9d4c228da0634bdf4b5200c6b673c44496dc4a95 (patch) | |
| tree | 601d627199db528c5bdec3849fda00694c161425 /recipes-kernel | |
| parent | bf00a88c23bb753f4bd59bc3d6888dfb66b02798 (diff) | |
| download | meta-xilinx-9d4c228da0634bdf4b5200c6b673c44496dc4a95.tar.gz | |
linux/config: Rework configs
* Organize configs into bsp/xilinx/ and bsp/xilinx/soc/
* Split some of the linux-xlnx only configs into a seperate fragment
* Clean up some of the configs to be in common and specific config
fragment files
Signed-off-by: Nathan Rossi <nathan.rossi@xilinx.com>
Diffstat (limited to 'recipes-kernel')
23 files changed, 89 insertions, 97 deletions
diff --git a/recipes-kernel/linux/config/xilinx-base/bsp/xilinx/xilinx-drivers-linux-xlnx.cfg b/recipes-kernel/linux/config/xilinx-base/bsp/xilinx/xilinx-drivers-linux-xlnx.cfg new file mode 100644 index 00000000..adcc9a4a --- /dev/null +++ b/recipes-kernel/linux/config/xilinx-base/bsp/xilinx/xilinx-drivers-linux-xlnx.cfg | |||
| @@ -0,0 +1,14 @@ | |||
| 1 | |||
| 2 | # DMA | ||
| 3 | CONFIG_XILINX_DMA_ENGINES=y | ||
| 4 | CONFIG_XILINX_AXIDMA=y | ||
| 5 | CONFIG_XILINX_AXIVDMA=y | ||
| 6 | CONFIG_XILINX_AXICDMA=y | ||
| 7 | |||
| 8 | # PCI(e) | ||
| 9 | CONFIG_XILINX_AXIPCIE=y | ||
| 10 | CONFIG_PCI_MSI=y | ||
| 11 | |||
| 12 | # Xilinx Traffic Generator | ||
| 13 | CONFIG_XILINX_TRAFGEN=y | ||
| 14 | |||
diff --git a/recipes-kernel/linux/config/xilinx-common/features/xilinx/xilinx-ip.scc b/recipes-kernel/linux/config/xilinx-base/bsp/xilinx/xilinx-drivers-linux-xlnx.scc index e4f75d7e..3934fdac 100644 --- a/recipes-kernel/linux/config/xilinx-common/features/xilinx/xilinx-ip.scc +++ b/recipes-kernel/linux/config/xilinx-base/bsp/xilinx/xilinx-drivers-linux-xlnx.scc | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | define KFEATURE_DESCRIPTION "Xilinx Soft IP Core Drivers/Support" | 1 | define KFEATURE_DESCRIPTION "Xilinx Soft IP Core Drivers/Support (For linux-xlnx kernels)" |
| 2 | define KFEATURE_COMPATIBILITY board | 2 | define KFEATURE_COMPATIBILITY board |
| 3 | 3 | ||
| 4 | kconfig hardware xilinx-ip.cfg | 4 | kconfig hardware xilinx-ip-linux-xlnx.cfg |
| 5 | 5 | ||
diff --git a/recipes-kernel/linux/config/xilinx-common/features/xilinx/board-common.cfg b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/board-common.cfg index 022c1d19..f762d461 100644 --- a/recipes-kernel/linux/config/xilinx-common/features/xilinx/board-common.cfg +++ b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/board-common.cfg | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | # Common drivers for Zynq Boards | 1 | # Common Board Drivers |
| 2 | 2 | ||
| 3 | CONFIG_LEGACY_PTYS=n | 3 | # CONFIG_LEGACY_PTYS is not set |
| 4 | 4 | ||
| 5 | # Ethernet PHYs | 5 | # Ethernet PHYs |
| 6 | CONFIG_PHYLIB=y | 6 | CONFIG_PHYLIB=y |
| @@ -19,6 +19,7 @@ CONFIG_EEPROM_AT25=y | |||
| 19 | 19 | ||
| 20 | # MTD | 20 | # MTD |
| 21 | CONFIG_MTD=y | 21 | CONFIG_MTD=y |
| 22 | CONFIG_MTD_SPI_NOR=y | ||
| 22 | CONFIG_MTD_M25P80=y | 23 | CONFIG_MTD_M25P80=y |
| 23 | CONFIG_MTD_CFI=y | 24 | CONFIG_MTD_CFI=y |
| 24 | CONFIG_MTD_CFI_AMDSTD=y | 25 | CONFIG_MTD_CFI_AMDSTD=y |
diff --git a/recipes-kernel/linux/config/xilinx-common/features/xilinx/board-common.scc b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/board-common.scc index 480158ee..6f1cd26c 100644 --- a/recipes-kernel/linux/config/xilinx-common/features/xilinx/board-common.scc +++ b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/board-common.scc | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | define KFEATURE_DESCRIPTION "Xilinx Evaluation Board Common Drivers" | 1 | define KFEATURE_DESCRIPTION "Xilinx Common Board Drivers" |
| 2 | define KFEATURE_COMPATIBILITY board | 2 | define KFEATURE_COMPATIBILITY board |
| 3 | 3 | ||
| 4 | kconfig hardware board-common.cfg | 4 | kconfig hardware board-common.cfg |
diff --git a/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/common.cfg b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/common.cfg new file mode 100644 index 00000000..903b4c50 --- /dev/null +++ b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/common.cfg | |||
| @@ -0,0 +1,7 @@ | |||
| 1 | |||
| 2 | # Device tree | ||
| 3 | CONFIG_PROC_DEVICETREE=y | ||
| 4 | |||
| 5 | # Debug | ||
| 6 | CONFIG_PRINTK_TIME=y | ||
| 7 | |||
diff --git a/recipes-kernel/linux/config/xilinx-common/bsp/microblaze/microblaze.scc b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/common.scc index 955e0275..3f29390e 100644 --- a/recipes-kernel/linux/config/xilinx-common/bsp/microblaze/microblaze.scc +++ b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/common.scc | |||
| @@ -1,8 +1,7 @@ | |||
| 1 | include arch/microblaze/microblaze.scc | 1 | define KFEATURE_DESCRIPTION "Xilinx Common BSP fragments" |
| 2 | define KFEATURE_COMPATIBILITY board | ||
| 2 | 3 | ||
| 3 | kconf hardware microblaze.cfg | 4 | kconfig hardware common.cfg |
| 4 | |||
| 5 | include features/xilinx/xilinx-ip.scc | ||
| 6 | 5 | ||
| 7 | include features/scsi/scsi.scc | 6 | include features/scsi/scsi.scc |
| 8 | include features/scsi/scsi-generic.scc | 7 | include features/scsi/scsi-generic.scc |
| @@ -12,3 +11,4 @@ include features/mtd/mtd.scc | |||
| 12 | include features/uio/uio.scc | 11 | include features/uio/uio.scc |
| 13 | 12 | ||
| 14 | include cfg/fs/debugfs.scc | 13 | include cfg/fs/debugfs.scc |
| 14 | |||
diff --git a/recipes-kernel/linux/config/xilinx-common/bsp/microblaze/microblaze-standard.scc b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/microblaze-standard.scc index 66eaccca..170489d4 100644 --- a/recipes-kernel/linux/config/xilinx-common/bsp/microblaze/microblaze-standard.scc +++ b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/microblaze-standard.scc | |||
| @@ -4,10 +4,10 @@ define KARCH microblaze | |||
| 4 | 4 | ||
| 5 | include ktypes/standard/standard.scc | 5 | include ktypes/standard/standard.scc |
| 6 | 6 | ||
| 7 | include bsp/microblaze/microblaze.scc | 7 | include bsp/xilinx/soc/microblaze.scc |
| 8 | 8 | ||
| 9 | # Common board drivers | 9 | # Common board drivers |
| 10 | include features/xilinx/board-common.scc | 10 | include bsp/xilinx/board-common.scc |
| 11 | 11 | ||
| 12 | # default policy for standard kernels | 12 | # default policy for standard kernels |
| 13 | include features/latencytop/latencytop.scc | 13 | include features/latencytop/latencytop.scc |
diff --git a/recipes-kernel/linux/config/xilinx-common/features/xilinx/disable-macb.cfg b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/disable-macb.cfg index 536c8e0d..536c8e0d 100644 --- a/recipes-kernel/linux/config/xilinx-common/features/xilinx/disable-macb.cfg +++ b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/disable-macb.cfg | |||
diff --git a/recipes-kernel/linux/config/xilinx-common/features/xilinx/disable-macb.scc b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/disable-macb.scc index e44196bc..e44196bc 100644 --- a/recipes-kernel/linux/config/xilinx-common/features/xilinx/disable-macb.scc +++ b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/disable-macb.scc | |||
diff --git a/recipes-kernel/linux/config/xilinx-common/bsp/microblaze/microblaze.cfg b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/microblaze.cfg index e9dcfb7a..464f945b 100644 --- a/recipes-kernel/linux/config/xilinx-common/bsp/microblaze/microblaze.cfg +++ b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/microblaze.cfg | |||
| @@ -13,16 +13,15 @@ CONFIG_XILINX_MICROBLAZE0_USE_FPU=0 | |||
| 13 | # Memory | 13 | # Memory |
| 14 | CONFIG_HIGHMEM=y | 14 | CONFIG_HIGHMEM=y |
| 15 | 15 | ||
| 16 | # Device tree | ||
| 17 | CONFIG_PROC_DEVICETREE=y | ||
| 18 | |||
| 19 | # Debug | ||
| 20 | CONFIG_PRINTK_TIME=y | ||
| 21 | CONFIG_EARLY_PRINTK=y | ||
| 22 | |||
| 23 | # OF Scan serial devices | 16 | # OF Scan serial devices |
| 24 | CONFIG_SERIAL_OF_PLATFORM=y | 17 | CONFIG_SERIAL_OF_PLATFORM=y |
| 25 | 18 | ||
| 19 | # Xilinx SYSACE (MicroBlaze only) | ||
| 20 | CONFIG_XILINX_SYSACE=y | ||
| 21 | |||
| 22 | # Xilinx HW-ICAP (MicroBlaze only) | ||
| 23 | CONFIG_XILINX_HWICAP=y | ||
| 24 | |||
| 26 | # Disable VT (Non-Functional with MicroBlaze) | 25 | # Disable VT (Non-Functional with MicroBlaze) |
| 27 | CONFIG_VT=n | 26 | CONFIG_VT=n |
| 28 | # Disable FTRACE, does not work with MicroBlaze | 27 | # Disable FTRACE, does not work with MicroBlaze |
diff --git a/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/microblaze.scc b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/microblaze.scc new file mode 100644 index 00000000..f5c10386 --- /dev/null +++ b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/microblaze.scc | |||
| @@ -0,0 +1,6 @@ | |||
| 1 | include arch/microblaze/microblaze.scc | ||
| 2 | |||
| 3 | kconf hardware microblaze.cfg | ||
| 4 | include bsp/xilinx/common.scc | ||
| 5 | include bsp/xilinx/soc/xilinx-drivers.scc | ||
| 6 | |||
diff --git a/recipes-kernel/linux/config/xilinx-common/features/xilinx/xilinx-ip.cfg b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/xilinx-drivers.cfg index b72c3841..fc53f3d1 100644 --- a/recipes-kernel/linux/config/xilinx-common/features/xilinx/xilinx-ip.cfg +++ b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/xilinx-drivers.cfg | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | 1 | ||
| 2 | # Serial/UART | 2 | # Serial/UART |
| 3 | CONFIG_SERIAL=y | 3 | CONFIG_SERIAL=y |
| 4 | CONFIG_SERIAL_CONSOLE=y | ||
| 5 | CONFIG_SERIAL_8250=y | 4 | CONFIG_SERIAL_8250=y |
| 6 | CONFIG_SERIAL_8250_CONSOLE=y | 5 | CONFIG_SERIAL_8250_CONSOLE=y |
| 7 | CONFIG_SERIAL_UARTLITE=y | 6 | CONFIG_SERIAL_UARTLITE=y |
| @@ -10,10 +9,6 @@ CONFIG_SERIAL_UARTLITE_CONSOLE=y | |||
| 10 | # DMA | 9 | # DMA |
| 11 | CONFIG_DMADEVICES=y | 10 | CONFIG_DMADEVICES=y |
| 12 | CONFIG_XILINX_VDMA=y | 11 | CONFIG_XILINX_VDMA=y |
| 13 | CONFIG_XILINX_DMA_ENGINES=y | ||
| 14 | CONFIG_XILINX_AXIDMA=y | ||
| 15 | CONFIG_XILINX_AXIVDMA=y | ||
| 16 | CONFIG_XILINX_AXICDMA=y | ||
| 17 | 12 | ||
| 18 | # Watchdog | 13 | # Watchdog |
| 19 | CONFIG_WATCHDOG=y | 14 | CONFIG_WATCHDOG=y |
| @@ -37,20 +32,10 @@ CONFIG_I2C_XILINX=y | |||
| 37 | CONFIG_SPI=y | 32 | CONFIG_SPI=y |
| 38 | CONFIG_SPI_XILINX=y | 33 | CONFIG_SPI_XILINX=y |
| 39 | 34 | ||
| 40 | # PCI(e) | ||
| 41 | CONFIG_XILINX_AXIPCIE=y | ||
| 42 | CONFIG_PCI_MSI=y | ||
| 43 | |||
| 44 | # Xilinx Traffic Generator | ||
| 45 | CONFIG_XILINX_TRAFGEN=y | ||
| 46 | |||
| 47 | # Xilinx XADC | 35 | # Xilinx XADC |
| 48 | CONFIG_IIO=y | 36 | CONFIG_IIO=y |
| 49 | CONFIG_XILINX_XADC=y | 37 | CONFIG_XILINX_XADC=y |
| 50 | 38 | ||
| 51 | # Xilinx SYSACE | 39 | # Xilinx AXI USB2 Device |
| 52 | CONFIG_XILINX_SYSACE=y | 40 | CONFIG_USB_GADGET_XILINX=y |
| 53 | |||
| 54 | # Xilinx HW-ICAP | ||
| 55 | CONFIG_XILINX_HWICAP=y | ||
| 56 | 41 | ||
diff --git a/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/xilinx-drivers.scc b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/xilinx-drivers.scc new file mode 100644 index 00000000..fe6b6103 --- /dev/null +++ b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/xilinx-drivers.scc | |||
| @@ -0,0 +1,5 @@ | |||
| 1 | define KFEATURE_DESCRIPTION "Xilinx Soft IP Core Drivers" | ||
| 2 | define KFEATURE_COMPATIBILITY board | ||
| 3 | |||
| 4 | kconfig hardware xilinx-drivers.cfg | ||
| 5 | |||
diff --git a/recipes-kernel/linux/config/xilinx-common/bsp/zynq/zynq.cfg b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/zynq.cfg index 07f0ccb2..808ec20a 100644 --- a/recipes-kernel/linux/config/xilinx-common/bsp/zynq/zynq.cfg +++ b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/zynq.cfg | |||
| @@ -45,10 +45,3 @@ CONFIG_EDAC=y | |||
| 45 | CONFIG_EDAC_MM_EDAC=y | 45 | CONFIG_EDAC_MM_EDAC=y |
| 46 | CONFIG_EDAC_ZYNQ=y | 46 | CONFIG_EDAC_ZYNQ=y |
| 47 | 47 | ||
| 48 | # Device tree | ||
| 49 | CONFIG_PROC_DEVICETREE=y | ||
| 50 | |||
| 51 | # Debug | ||
| 52 | CONFIG_PRINTK_TIME=y | ||
| 53 | CONFIG_EARLY_PRINTK=y | ||
| 54 | |||
diff --git a/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/zynq.scc b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/zynq.scc new file mode 100644 index 00000000..345cdc9c --- /dev/null +++ b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/zynq.scc | |||
| @@ -0,0 +1,10 @@ | |||
| 1 | |||
| 2 | kconf hardware zynq.cfg | ||
| 3 | kconf hardware zynq7-drivers.cfg | ||
| 4 | include bsp/xilinx/soc/xilinx-drivers.scc | ||
| 5 | include bsp/xilinx/common.scc | ||
| 6 | |||
| 7 | include cfg/timer/no_hz.scc | ||
| 8 | include cfg/usb-mass-storage.scc | ||
| 9 | include features/blk/dev-ram-32mb.scc | ||
| 10 | |||
diff --git a/recipes-kernel/linux/config/xilinx-common/features/xilinx/zynq7-ip.cfg b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/zynq7-drivers.cfg index 1ef12244..4ddf9db2 100644 --- a/recipes-kernel/linux/config/xilinx-common/features/xilinx/zynq7-ip.cfg +++ b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/zynq7-drivers.cfg | |||
| @@ -3,15 +3,11 @@ | |||
| 3 | CONFIG_SERIAL_XILINX_PS_UART=y | 3 | CONFIG_SERIAL_XILINX_PS_UART=y |
| 4 | CONFIG_SERIAL_XILINX_PS_UART_CONSOLE=y | 4 | CONFIG_SERIAL_XILINX_PS_UART_CONSOLE=y |
| 5 | 5 | ||
| 6 | # devcfg | ||
| 7 | CONFIG_XILINX_DEVCFG=y | ||
| 8 | |||
| 9 | # SRAM | 6 | # SRAM |
| 10 | CONFIG_SRAM=y | 7 | CONFIG_SRAM=y |
| 11 | 8 | ||
| 12 | # DMA | 9 | # DMA |
| 13 | CONFIG_DMADEVICES=y | 10 | CONFIG_DMADEVICES=y |
| 14 | CONFIG_XILINX_DMA_ENGINES=y | ||
| 15 | CONFIG_PL330_DMA=y | 11 | CONFIG_PL330_DMA=y |
| 16 | 12 | ||
| 17 | # PL310 | 13 | # PL310 |
| @@ -19,6 +15,9 @@ CONFIG_PL310_ERRATA_588369=y | |||
| 19 | CONFIG_PL310_ERRATA_727915=y | 15 | CONFIG_PL310_ERRATA_727915=y |
| 20 | CONFIG_PL310_ERRATA_769419=y | 16 | CONFIG_PL310_ERRATA_769419=y |
| 21 | 17 | ||
| 18 | # Devcfg | ||
| 19 | CONFIG_XILINX_DEVCFG=y | ||
| 20 | |||
| 22 | # Watchdog | 21 | # Watchdog |
| 23 | CONFIG_WATCHDOG=y | 22 | CONFIG_WATCHDOG=y |
| 24 | CONFIG_CADENCE_WATCHDOG=y | 23 | CONFIG_CADENCE_WATCHDOG=y |
| @@ -53,15 +52,22 @@ CONFIG_MMC_SDHCI_OF_ARASAN=y | |||
| 53 | # NAND | 52 | # NAND |
| 54 | CONFIG_MTD_NAND_PL353=y | 53 | CONFIG_MTD_NAND_PL353=y |
| 55 | 54 | ||
| 55 | # USB | ||
| 56 | CONFIG_USB=y | ||
| 57 | CONFIG_USB_CHIPIDEA=y | ||
| 58 | CONFIG_USB_CHIPIDEA_UDC=y | ||
| 59 | CONFIG_USB_CHIPIDEA_HOST=y | ||
| 60 | CONFIG_NOP_USB_XCEIV=y | ||
| 61 | CONFIG_USB_OTG=y | ||
| 62 | CONFIG_USB_GADGET=y | ||
| 63 | |||
| 56 | # USB (+otg) | 64 | # USB (+otg) |
| 57 | CONFIG_USB=y | 65 | CONFIG_USB=y |
| 58 | CONFIG_USB_ZYNQ=y | 66 | CONFIG_USB_ZYNQ=y |
| 59 | CONFIG_USB_ZYNQ_PHY=y | 67 | CONFIG_USB_ZYNQ_PHY=y |
| 60 | CONFIG_USB_ZYNQ_ERRATA_DT654401=y | 68 | CONFIG_USB_ZYNQ_ERRATA_DT654401=y |
| 61 | CONFIG_USB_OTG=y | ||
| 62 | CONFIG_USB_ZYNQ_DR_OF=y | 69 | CONFIG_USB_ZYNQ_DR_OF=y |
| 63 | CONFIG_USB_EHCI_HCD=y | 70 | CONFIG_USB_EHCI_HCD=y |
| 64 | CONFIG_USB_EHCI_ZYNQ=y | 71 | CONFIG_USB_EHCI_ZYNQ=y |
| 65 | CONFIG_USB_GADGET=y | 72 | CONFIG_USB_GADGET=y |
| 66 | CONFIG_USB_GADGET_XILINX=y | ||
| 67 | 73 | ||
diff --git a/recipes-kernel/linux/config/xilinx-common/bsp/zynqmp/zynqmp.cfg b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/zynqmp.cfg index 57944f37..b9b50088 100644 --- a/recipes-kernel/linux/config/xilinx-common/bsp/zynqmp/zynqmp.cfg +++ b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/zynqmp.cfg | |||
| @@ -7,9 +7,6 @@ CONFIG_ARCH_ZYNQMP=y | |||
| 7 | # SMP | 7 | # SMP |
| 8 | CONFIG_SMP=y | 8 | CONFIG_SMP=y |
| 9 | 9 | ||
| 10 | # Debug | ||
| 11 | CONFIG_PRINTK_TIME=y | ||
| 12 | |||
| 13 | CONFIG_SERIAL_XILINX_PS_UART=y | 10 | CONFIG_SERIAL_XILINX_PS_UART=y |
| 14 | CONFIG_SERIAL_XILINX_PS_UART_CONSOLE=y | 11 | CONFIG_SERIAL_XILINX_PS_UART_CONSOLE=y |
| 15 | 12 | ||
diff --git a/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/zynqmp.scc b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/zynqmp.scc new file mode 100644 index 00000000..6713767b --- /dev/null +++ b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/zynqmp.scc | |||
| @@ -0,0 +1,11 @@ | |||
| 1 | # include arch/arm64/arm64.scc | ||
| 2 | include cfg/timer/hz_100.scc | ||
| 3 | |||
| 4 | kconf hardware zynqmp.cfg | ||
| 5 | # include bsp/xilinx/soc/xilinx-drivers.scc | ||
| 6 | # include bsp/xilinx/soc/zynqmp-ip.scc | ||
| 7 | include bsp/xilinx/common.scc | ||
| 8 | |||
| 9 | include cfg/timer/no_hz.scc | ||
| 10 | include cfg/usb-mass-storage.scc | ||
| 11 | |||
diff --git a/recipes-kernel/linux/config/xilinx-common/bsp/zynq/zynq-standard.scc b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/zynq-standard.scc index 05ab5ec1..f952f080 100644 --- a/recipes-kernel/linux/config/xilinx-common/bsp/zynq/zynq-standard.scc +++ b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/zynq-standard.scc | |||
| @@ -4,10 +4,10 @@ define KARCH arm | |||
| 4 | 4 | ||
| 5 | include ktypes/standard/standard.scc | 5 | include ktypes/standard/standard.scc |
| 6 | 6 | ||
| 7 | include bsp/zynq/zynq.scc | 7 | include bsp/xilinx/soc/zynq.scc |
| 8 | 8 | ||
| 9 | # Common board drivers | 9 | # Common board drivers |
| 10 | include features/xilinx/board-common.scc | 10 | include bsp/xilinx/board-common.scc |
| 11 | 11 | ||
| 12 | # default policy for standard kernels | 12 | # default policy for standard kernels |
| 13 | include features/latencytop/latencytop.scc | 13 | include features/latencytop/latencytop.scc |
diff --git a/recipes-kernel/linux/config/xilinx-common/bsp/zynqmp/zynqmp-standard.scc b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/zynqmp-standard.scc index 8092ec7d..bc4f6e8b 100644 --- a/recipes-kernel/linux/config/xilinx-common/bsp/zynqmp/zynqmp-standard.scc +++ b/recipes-kernel/linux/config/xilinx-common/bsp/xilinx/zynqmp-standard.scc | |||
| @@ -4,10 +4,10 @@ define KARCH arm64 | |||
| 4 | 4 | ||
| 5 | include ktypes/standard/standard.scc | 5 | include ktypes/standard/standard.scc |
| 6 | 6 | ||
| 7 | include bsp/zynqmp/zynqmp.scc | 7 | include bsp/xilinx/soc/zynqmp.scc |
| 8 | 8 | ||
| 9 | # Common board drivers | 9 | # Common board drivers |
| 10 | include features/xilinx/board-common.scc | 10 | include bsp/xilinx/board-common.scc |
| 11 | 11 | ||
| 12 | # default policy for standard kernels | 12 | # default policy for standard kernels |
| 13 | #include features/latencytop/latencytop.scc | 13 | #include features/latencytop/latencytop.scc |
diff --git a/recipes-kernel/linux/config/xilinx-common/bsp/zynq/zynq.scc b/recipes-kernel/linux/config/xilinx-common/bsp/zynq/zynq.scc deleted file mode 100644 index 187f83a9..00000000 --- a/recipes-kernel/linux/config/xilinx-common/bsp/zynq/zynq.scc +++ /dev/null | |||
| @@ -1,18 +0,0 @@ | |||
| 1 | kconf hardware zynq.cfg | ||
| 2 | |||
| 3 | include cfg/timer/no_hz.scc | ||
| 4 | |||
| 5 | include features/xilinx/zynq7-ip.scc | ||
| 6 | include features/xilinx/xilinx-ip.scc | ||
| 7 | |||
| 8 | include cfg/usb-mass-storage.scc | ||
| 9 | |||
| 10 | include features/scsi/scsi.scc | ||
| 11 | include features/scsi/scsi-generic.scc | ||
| 12 | include features/scsi/disk.scc | ||
| 13 | |||
| 14 | include features/blk/dev-ram-32mb.scc | ||
| 15 | include features/mtd/mtd.scc | ||
| 16 | include features/uio/uio.scc | ||
| 17 | |||
| 18 | include cfg/fs/debugfs.scc | ||
diff --git a/recipes-kernel/linux/config/xilinx-common/bsp/zynqmp/zynqmp.scc b/recipes-kernel/linux/config/xilinx-common/bsp/zynqmp/zynqmp.scc deleted file mode 100644 index 360ba5d1..00000000 --- a/recipes-kernel/linux/config/xilinx-common/bsp/zynqmp/zynqmp.scc +++ /dev/null | |||
| @@ -1,19 +0,0 @@ | |||
| 1 | # include arch/arm64/arm64.scc | ||
| 2 | include cfg/timer/hz_100.scc | ||
| 3 | |||
| 4 | kconf hardware zynqmp.cfg | ||
| 5 | |||
| 6 | include cfg/timer/no_hz.scc | ||
| 7 | |||
| 8 | # include features/xilinx/xilinx-ip.scc | ||
| 9 | |||
| 10 | include cfg/usb-mass-storage.scc | ||
| 11 | |||
| 12 | include features/scsi/scsi.scc | ||
| 13 | include features/scsi/scsi-generic.scc | ||
| 14 | include features/scsi/disk.scc | ||
| 15 | |||
| 16 | include features/mtd/mtd.scc | ||
| 17 | include features/uio/uio.scc | ||
| 18 | |||
| 19 | include cfg/fs/debugfs.scc | ||
diff --git a/recipes-kernel/linux/config/xilinx-common/features/xilinx/zynq7-ip.scc b/recipes-kernel/linux/config/xilinx-common/features/xilinx/zynq7-ip.scc deleted file mode 100644 index 3a7f8ce4..00000000 --- a/recipes-kernel/linux/config/xilinx-common/features/xilinx/zynq7-ip.scc +++ /dev/null | |||
| @@ -1,5 +0,0 @@ | |||
| 1 | define KFEATURE_DESCRIPTION "Xilinx Zynq 7000 IP Core Drivers/Support" | ||
| 2 | define KFEATURE_COMPATIBILITY board | ||
| 3 | |||
| 4 | kconfig hardware zynq7-ip.cfg | ||
| 5 | |||
