diff options
| author | Khem Raj <raj.khem@gmail.com> | 2015-11-16 10:55:02 -0800 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2015-11-16 10:55:02 -0800 |
| commit | 2354b2d37412c76d147b515a5f1463e3ae6a775f (patch) | |
| tree | afdb821e5184141cf6ec555cd26fdee2817645cd | |
| parent | 1acb189203c5a0e02f6f4b739a00e7d124346806 (diff) | |
| parent | ac6cf3d5122657881f58f199e74036c8cb5996fe (diff) | |
| download | meta-altera-2354b2d37412c76d147b515a5f1463e3ae6a775f.tar.gz | |
Merge pull request #6 from dwesterg/master
Final bit of cleanup
| -rw-r--r-- | recipes-kernel/linux/config/socfpga-base/features/altera/arria10-ip.cfg | 1 | ||||
| -rw-r--r-- | recipes-kernel/linux/config/socfpga-base/features/altera/cyclone5_arria5-ip.cfg | 11 | ||||
| -rw-r--r-- | recipes-kernel/linux/linux-altera-dev_4.2.bb (renamed from recipes-kernel/linux/linux-altera-dev.bb) | 0 | ||||
| -rw-r--r-- | recipes-kernel/linux/linux-altera-ltsi-dev_3.10.bb (renamed from recipes-kernel/linux/linux-altera-ltsi-dev.bb) | 0 | ||||
| -rw-r--r-- | recipes-kernel/linux/linux-altera-ltsi-rt-dev_3.10.bb | 7 |
5 files changed, 19 insertions, 0 deletions
diff --git a/recipes-kernel/linux/config/socfpga-base/features/altera/arria10-ip.cfg b/recipes-kernel/linux/config/socfpga-base/features/altera/arria10-ip.cfg index 5f9fecb..bdd369d 100644 --- a/recipes-kernel/linux/config/socfpga-base/features/altera/arria10-ip.cfg +++ b/recipes-kernel/linux/config/socfpga-base/features/altera/arria10-ip.cfg | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | CONFIG_FPGA_MGR_SOCFPGA_A10=y | 1 | CONFIG_FPGA_MGR_SOCFPGA_A10=y |
| 2 | CONFIG_GPIO_A10SYCON=y | 2 | CONFIG_GPIO_A10SYCON=y |
| 3 | CONFIG_SENSORS_A10SYCON=y | 3 | CONFIG_SENSORS_A10SYCON=y |
| 4 | CONFIG_A10SYCON_RESET=y | ||
diff --git a/recipes-kernel/linux/config/socfpga-base/features/altera/cyclone5_arria5-ip.cfg b/recipes-kernel/linux/config/socfpga-base/features/altera/cyclone5_arria5-ip.cfg index e7ee368..a3171ad 100644 --- a/recipes-kernel/linux/config/socfpga-base/features/altera/cyclone5_arria5-ip.cfg +++ b/recipes-kernel/linux/config/socfpga-base/features/altera/cyclone5_arria5-ip.cfg | |||
| @@ -109,3 +109,14 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=2 | |||
| 109 | CONFIG_CAN=y | 109 | CONFIG_CAN=y |
| 110 | CONFIG_CAN_C_CAN=y | 110 | CONFIG_CAN_C_CAN=y |
| 111 | CONFIG_CAN_C_CAN_PLATFORM=y | 111 | CONFIG_CAN_C_CAN_PLATFORM=y |
| 112 | |||
| 113 | # EDAC | ||
| 114 | CONFIG_EDAC=y | ||
| 115 | CONFIG_EDAC_LEGACY_SYSFS=y | ||
| 116 | # CONFIG_EDAC_DEBUG is not set | ||
| 117 | CONFIG_EDAC_MM_EDAC=y | ||
| 118 | CONFIG_EDAC_ALTERA_MC=y | ||
| 119 | CONFIG_EDAC_ALTERA_ECC_MGR=y | ||
| 120 | CONFIG_EDAC_ALTERA_L2_ECC=y | ||
| 121 | CONFIG_EDAC_ALTERA_OCRAM_ECC=y | ||
| 122 | CONFIG_EDAC_ALTERA_NAND_ECC=y | ||
diff --git a/recipes-kernel/linux/linux-altera-dev.bb b/recipes-kernel/linux/linux-altera-dev_4.2.bb index 482c219..482c219 100644 --- a/recipes-kernel/linux/linux-altera-dev.bb +++ b/recipes-kernel/linux/linux-altera-dev_4.2.bb | |||
diff --git a/recipes-kernel/linux/linux-altera-ltsi-dev.bb b/recipes-kernel/linux/linux-altera-ltsi-dev_3.10.bb index 33c7d4c..33c7d4c 100644 --- a/recipes-kernel/linux/linux-altera-ltsi-dev.bb +++ b/recipes-kernel/linux/linux-altera-ltsi-dev_3.10.bb | |||
diff --git a/recipes-kernel/linux/linux-altera-ltsi-rt-dev_3.10.bb b/recipes-kernel/linux/linux-altera-ltsi-rt-dev_3.10.bb new file mode 100644 index 0000000..6897a28 --- /dev/null +++ b/recipes-kernel/linux/linux-altera-ltsi-rt-dev_3.10.bb | |||
| @@ -0,0 +1,7 @@ | |||
| 1 | LINUX_VERSION = "3.10" | ||
| 2 | LINUX_VERSION_SUFFIX = "-ltsi-rt" | ||
| 3 | |||
| 4 | KERNEL_DEVICETREE_cyclone5 ?= "socfpga_cyclone5.dtb" | ||
| 5 | KERNEL_DEVICETREE_arria5 ?= "socfpga_arria5.dtb" | ||
| 6 | |||
| 7 | include linux-altera.inc | ||