summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNathan Rossi <nathan.rossi@xilinx.com>2015-03-09 14:43:52 +1000
committerNathan Rossi <nathan.rossi@xilinx.com>2015-03-31 15:56:48 +1000
commit9d4c228da0634bdf4b5200c6b673c44496dc4a95 (patch)
tree601d627199db528c5bdec3849fda00694c161425
parentbf00a88c23bb753f4bd59bc3d6888dfb66b02798 (diff)
downloadmeta-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
-rw-r--r--recipes-kernel/linux/config/xilinx-base/bsp/xilinx/xilinx-drivers-linux-xlnx.cfg14
-rw-r--r--recipes-kernel/linux/config/xilinx-base/bsp/xilinx/xilinx-drivers-linux-xlnx.scc (renamed from recipes-kernel/linux/config/xilinx-common/features/xilinx/xilinx-ip.scc)4
-rw-r--r--recipes-kernel/linux/config/xilinx-common/bsp/xilinx/board-common.cfg (renamed from recipes-kernel/linux/config/xilinx-common/features/xilinx/board-common.cfg)5
-rw-r--r--recipes-kernel/linux/config/xilinx-common/bsp/xilinx/board-common.scc (renamed from recipes-kernel/linux/config/xilinx-common/features/xilinx/board-common.scc)2
-rw-r--r--recipes-kernel/linux/config/xilinx-common/bsp/xilinx/common.cfg7
-rw-r--r--recipes-kernel/linux/config/xilinx-common/bsp/xilinx/common.scc (renamed from recipes-kernel/linux/config/xilinx-common/bsp/microblaze/microblaze.scc)8
-rw-r--r--recipes-kernel/linux/config/xilinx-common/bsp/xilinx/microblaze-standard.scc (renamed from recipes-kernel/linux/config/xilinx-common/bsp/microblaze/microblaze-standard.scc)4
-rw-r--r--recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/disable-macb.cfg (renamed from recipes-kernel/linux/config/xilinx-common/features/xilinx/disable-macb.cfg)0
-rw-r--r--recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/disable-macb.scc (renamed from recipes-kernel/linux/config/xilinx-common/features/xilinx/disable-macb.scc)0
-rw-r--r--recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/microblaze.cfg (renamed from recipes-kernel/linux/config/xilinx-common/bsp/microblaze/microblaze.cfg)13
-rw-r--r--recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/microblaze.scc6
-rw-r--r--recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/xilinx-drivers.cfg (renamed from recipes-kernel/linux/config/xilinx-common/features/xilinx/xilinx-ip.cfg)19
-rw-r--r--recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/xilinx-drivers.scc5
-rw-r--r--recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/zynq.cfg (renamed from recipes-kernel/linux/config/xilinx-common/bsp/zynq/zynq.cfg)7
-rw-r--r--recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/zynq.scc10
-rw-r--r--recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/zynq7-drivers.cfg (renamed from recipes-kernel/linux/config/xilinx-common/features/xilinx/zynq7-ip.cfg)18
-rw-r--r--recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/zynqmp.cfg (renamed from recipes-kernel/linux/config/xilinx-common/bsp/zynqmp/zynqmp.cfg)3
-rw-r--r--recipes-kernel/linux/config/xilinx-common/bsp/xilinx/soc/zynqmp.scc11
-rw-r--r--recipes-kernel/linux/config/xilinx-common/bsp/xilinx/zynq-standard.scc (renamed from recipes-kernel/linux/config/xilinx-common/bsp/zynq/zynq-standard.scc)4
-rw-r--r--recipes-kernel/linux/config/xilinx-common/bsp/xilinx/zynqmp-standard.scc (renamed from recipes-kernel/linux/config/xilinx-common/bsp/zynqmp/zynqmp-standard.scc)4
-rw-r--r--recipes-kernel/linux/config/xilinx-common/bsp/zynq/zynq.scc18
-rw-r--r--recipes-kernel/linux/config/xilinx-common/bsp/zynqmp/zynqmp.scc19
-rw-r--r--recipes-kernel/linux/config/xilinx-common/features/xilinx/zynq7-ip.scc5
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
3CONFIG_XILINX_DMA_ENGINES=y
4CONFIG_XILINX_AXIDMA=y
5CONFIG_XILINX_AXIVDMA=y
6CONFIG_XILINX_AXICDMA=y
7
8# PCI(e)
9CONFIG_XILINX_AXIPCIE=y
10CONFIG_PCI_MSI=y
11
12# Xilinx Traffic Generator
13CONFIG_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 @@
1define KFEATURE_DESCRIPTION "Xilinx Soft IP Core Drivers/Support" 1define KFEATURE_DESCRIPTION "Xilinx Soft IP Core Drivers/Support (For linux-xlnx kernels)"
2define KFEATURE_COMPATIBILITY board 2define KFEATURE_COMPATIBILITY board
3 3
4kconfig hardware xilinx-ip.cfg 4kconfig 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
3CONFIG_LEGACY_PTYS=n 3# CONFIG_LEGACY_PTYS is not set
4 4
5# Ethernet PHYs 5# Ethernet PHYs
6CONFIG_PHYLIB=y 6CONFIG_PHYLIB=y
@@ -19,6 +19,7 @@ CONFIG_EEPROM_AT25=y
19 19
20# MTD 20# MTD
21CONFIG_MTD=y 21CONFIG_MTD=y
22CONFIG_MTD_SPI_NOR=y
22CONFIG_MTD_M25P80=y 23CONFIG_MTD_M25P80=y
23CONFIG_MTD_CFI=y 24CONFIG_MTD_CFI=y
24CONFIG_MTD_CFI_AMDSTD=y 25CONFIG_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 @@
1define KFEATURE_DESCRIPTION "Xilinx Evaluation Board Common Drivers" 1define KFEATURE_DESCRIPTION "Xilinx Common Board Drivers"
2define KFEATURE_COMPATIBILITY board 2define KFEATURE_COMPATIBILITY board
3 3
4kconfig hardware board-common.cfg 4kconfig 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
3CONFIG_PROC_DEVICETREE=y
4
5# Debug
6CONFIG_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 @@
1include arch/microblaze/microblaze.scc 1define KFEATURE_DESCRIPTION "Xilinx Common BSP fragments"
2define KFEATURE_COMPATIBILITY board
2 3
3kconf hardware microblaze.cfg 4kconfig hardware common.cfg
4
5include features/xilinx/xilinx-ip.scc
6 5
7include features/scsi/scsi.scc 6include features/scsi/scsi.scc
8include features/scsi/scsi-generic.scc 7include features/scsi/scsi-generic.scc
@@ -12,3 +11,4 @@ include features/mtd/mtd.scc
12include features/uio/uio.scc 11include features/uio/uio.scc
13 12
14include cfg/fs/debugfs.scc 13include 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
5include ktypes/standard/standard.scc 5include ktypes/standard/standard.scc
6 6
7include bsp/microblaze/microblaze.scc 7include bsp/xilinx/soc/microblaze.scc
8 8
9# Common board drivers 9# Common board drivers
10include features/xilinx/board-common.scc 10include bsp/xilinx/board-common.scc
11 11
12# default policy for standard kernels 12# default policy for standard kernels
13include features/latencytop/latencytop.scc 13include 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
14CONFIG_HIGHMEM=y 14CONFIG_HIGHMEM=y
15 15
16# Device tree
17CONFIG_PROC_DEVICETREE=y
18
19# Debug
20CONFIG_PRINTK_TIME=y
21CONFIG_EARLY_PRINTK=y
22
23# OF Scan serial devices 16# OF Scan serial devices
24CONFIG_SERIAL_OF_PLATFORM=y 17CONFIG_SERIAL_OF_PLATFORM=y
25 18
19# Xilinx SYSACE (MicroBlaze only)
20CONFIG_XILINX_SYSACE=y
21
22# Xilinx HW-ICAP (MicroBlaze only)
23CONFIG_XILINX_HWICAP=y
24
26# Disable VT (Non-Functional with MicroBlaze) 25# Disable VT (Non-Functional with MicroBlaze)
27CONFIG_VT=n 26CONFIG_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 @@
1include arch/microblaze/microblaze.scc
2
3kconf hardware microblaze.cfg
4include bsp/xilinx/common.scc
5include 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
3CONFIG_SERIAL=y 3CONFIG_SERIAL=y
4CONFIG_SERIAL_CONSOLE=y
5CONFIG_SERIAL_8250=y 4CONFIG_SERIAL_8250=y
6CONFIG_SERIAL_8250_CONSOLE=y 5CONFIG_SERIAL_8250_CONSOLE=y
7CONFIG_SERIAL_UARTLITE=y 6CONFIG_SERIAL_UARTLITE=y
@@ -10,10 +9,6 @@ CONFIG_SERIAL_UARTLITE_CONSOLE=y
10# DMA 9# DMA
11CONFIG_DMADEVICES=y 10CONFIG_DMADEVICES=y
12CONFIG_XILINX_VDMA=y 11CONFIG_XILINX_VDMA=y
13CONFIG_XILINX_DMA_ENGINES=y
14CONFIG_XILINX_AXIDMA=y
15CONFIG_XILINX_AXIVDMA=y
16CONFIG_XILINX_AXICDMA=y
17 12
18# Watchdog 13# Watchdog
19CONFIG_WATCHDOG=y 14CONFIG_WATCHDOG=y
@@ -37,20 +32,10 @@ CONFIG_I2C_XILINX=y
37CONFIG_SPI=y 32CONFIG_SPI=y
38CONFIG_SPI_XILINX=y 33CONFIG_SPI_XILINX=y
39 34
40# PCI(e)
41CONFIG_XILINX_AXIPCIE=y
42CONFIG_PCI_MSI=y
43
44# Xilinx Traffic Generator
45CONFIG_XILINX_TRAFGEN=y
46
47# Xilinx XADC 35# Xilinx XADC
48CONFIG_IIO=y 36CONFIG_IIO=y
49CONFIG_XILINX_XADC=y 37CONFIG_XILINX_XADC=y
50 38
51# Xilinx SYSACE 39# Xilinx AXI USB2 Device
52CONFIG_XILINX_SYSACE=y 40CONFIG_USB_GADGET_XILINX=y
53
54# Xilinx HW-ICAP
55CONFIG_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 @@
1define KFEATURE_DESCRIPTION "Xilinx Soft IP Core Drivers"
2define KFEATURE_COMPATIBILITY board
3
4kconfig 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
45CONFIG_EDAC_MM_EDAC=y 45CONFIG_EDAC_MM_EDAC=y
46CONFIG_EDAC_ZYNQ=y 46CONFIG_EDAC_ZYNQ=y
47 47
48# Device tree
49CONFIG_PROC_DEVICETREE=y
50
51# Debug
52CONFIG_PRINTK_TIME=y
53CONFIG_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
2kconf hardware zynq.cfg
3kconf hardware zynq7-drivers.cfg
4include bsp/xilinx/soc/xilinx-drivers.scc
5include bsp/xilinx/common.scc
6
7include cfg/timer/no_hz.scc
8include cfg/usb-mass-storage.scc
9include 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 @@
3CONFIG_SERIAL_XILINX_PS_UART=y 3CONFIG_SERIAL_XILINX_PS_UART=y
4CONFIG_SERIAL_XILINX_PS_UART_CONSOLE=y 4CONFIG_SERIAL_XILINX_PS_UART_CONSOLE=y
5 5
6# devcfg
7CONFIG_XILINX_DEVCFG=y
8
9# SRAM 6# SRAM
10CONFIG_SRAM=y 7CONFIG_SRAM=y
11 8
12# DMA 9# DMA
13CONFIG_DMADEVICES=y 10CONFIG_DMADEVICES=y
14CONFIG_XILINX_DMA_ENGINES=y
15CONFIG_PL330_DMA=y 11CONFIG_PL330_DMA=y
16 12
17# PL310 13# PL310
@@ -19,6 +15,9 @@ CONFIG_PL310_ERRATA_588369=y
19CONFIG_PL310_ERRATA_727915=y 15CONFIG_PL310_ERRATA_727915=y
20CONFIG_PL310_ERRATA_769419=y 16CONFIG_PL310_ERRATA_769419=y
21 17
18# Devcfg
19CONFIG_XILINX_DEVCFG=y
20
22# Watchdog 21# Watchdog
23CONFIG_WATCHDOG=y 22CONFIG_WATCHDOG=y
24CONFIG_CADENCE_WATCHDOG=y 23CONFIG_CADENCE_WATCHDOG=y
@@ -53,15 +52,22 @@ CONFIG_MMC_SDHCI_OF_ARASAN=y
53# NAND 52# NAND
54CONFIG_MTD_NAND_PL353=y 53CONFIG_MTD_NAND_PL353=y
55 54
55# USB
56CONFIG_USB=y
57CONFIG_USB_CHIPIDEA=y
58CONFIG_USB_CHIPIDEA_UDC=y
59CONFIG_USB_CHIPIDEA_HOST=y
60CONFIG_NOP_USB_XCEIV=y
61CONFIG_USB_OTG=y
62CONFIG_USB_GADGET=y
63
56# USB (+otg) 64# USB (+otg)
57CONFIG_USB=y 65CONFIG_USB=y
58CONFIG_USB_ZYNQ=y 66CONFIG_USB_ZYNQ=y
59CONFIG_USB_ZYNQ_PHY=y 67CONFIG_USB_ZYNQ_PHY=y
60CONFIG_USB_ZYNQ_ERRATA_DT654401=y 68CONFIG_USB_ZYNQ_ERRATA_DT654401=y
61CONFIG_USB_OTG=y
62CONFIG_USB_ZYNQ_DR_OF=y 69CONFIG_USB_ZYNQ_DR_OF=y
63CONFIG_USB_EHCI_HCD=y 70CONFIG_USB_EHCI_HCD=y
64CONFIG_USB_EHCI_ZYNQ=y 71CONFIG_USB_EHCI_ZYNQ=y
65CONFIG_USB_GADGET=y 72CONFIG_USB_GADGET=y
66CONFIG_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
8CONFIG_SMP=y 8CONFIG_SMP=y
9 9
10# Debug
11CONFIG_PRINTK_TIME=y
12
13CONFIG_SERIAL_XILINX_PS_UART=y 10CONFIG_SERIAL_XILINX_PS_UART=y
14CONFIG_SERIAL_XILINX_PS_UART_CONSOLE=y 11CONFIG_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
2include cfg/timer/hz_100.scc
3
4kconf hardware zynqmp.cfg
5# include bsp/xilinx/soc/xilinx-drivers.scc
6# include bsp/xilinx/soc/zynqmp-ip.scc
7include bsp/xilinx/common.scc
8
9include cfg/timer/no_hz.scc
10include 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
5include ktypes/standard/standard.scc 5include ktypes/standard/standard.scc
6 6
7include bsp/zynq/zynq.scc 7include bsp/xilinx/soc/zynq.scc
8 8
9# Common board drivers 9# Common board drivers
10include features/xilinx/board-common.scc 10include bsp/xilinx/board-common.scc
11 11
12# default policy for standard kernels 12# default policy for standard kernels
13include features/latencytop/latencytop.scc 13include 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
5include ktypes/standard/standard.scc 5include ktypes/standard/standard.scc
6 6
7include bsp/zynqmp/zynqmp.scc 7include bsp/xilinx/soc/zynqmp.scc
8 8
9# Common board drivers 9# Common board drivers
10include features/xilinx/board-common.scc 10include 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 @@
1kconf hardware zynq.cfg
2
3include cfg/timer/no_hz.scc
4
5include features/xilinx/zynq7-ip.scc
6include features/xilinx/xilinx-ip.scc
7
8include cfg/usb-mass-storage.scc
9
10include features/scsi/scsi.scc
11include features/scsi/scsi-generic.scc
12include features/scsi/disk.scc
13
14include features/blk/dev-ram-32mb.scc
15include features/mtd/mtd.scc
16include features/uio/uio.scc
17
18include 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
2include cfg/timer/hz_100.scc
3
4kconf hardware zynqmp.cfg
5
6include cfg/timer/no_hz.scc
7
8# include features/xilinx/xilinx-ip.scc
9
10include cfg/usb-mass-storage.scc
11
12include features/scsi/scsi.scc
13include features/scsi/scsi-generic.scc
14include features/scsi/disk.scc
15
16include features/mtd/mtd.scc
17include features/uio/uio.scc
18
19include 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 @@
1define KFEATURE_DESCRIPTION "Xilinx Zynq 7000 IP Core Drivers/Support"
2define KFEATURE_COMPATIBILITY board
3
4kconfig hardware zynq7-ip.cfg
5
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-07-12 10:06:48 +0000