mirror of
https://github.com/edk2-porting/linux-next.git
synced 2024-12-21 19:53:59 +08:00
ee1a8d402e
These changes from 30 individual branches for the most part update device tree files, but there are also a few source code changes that have crept in this time, usually in order to atomically move over a driver from using hardcoded data to DT probing. A number of platforms change their DT files to use the C preprocessor, which is causing a bit of churn, but that is hopefully only this once. There are a few conflicts with the other branches unfortunately: * in exynos5440.dtsi and kirkwood-6281.dtsi, device nodes are added from multiple branches. Need to be careful to have the right set of closing braces as git gets this one wrong. * In kirkwood.dtsi, one 'ranges' line got split into two lines, while another line got added. Order of the lines does not matter. * in sama5d3.dtsi, some cleanup was merged the wrong way, causing a bogus conflict. We want the 'dmas' and 'dma-names' properties to get added here. * Two lines got removed independently in arch/arm/mach-mxs/mach-mxs.c * Contents get added independently in arch/arm/mach-omap2/cclock33xx_data.c -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iQIVAwUAUdLnpGCrR//JCVInAQI50RAAsXbH1SGvjKJemXhRkFloPDYpCbgdDUFr ChUbjNV1xsY/jaNCfMa5/Qo7lgz/Ot7BpJef9fZn7ret+dc7nchqe/4iIkAokAUh E4ao9D1dP5aAA0ihdbSQHCZtR/0SUR81h6BoOVuo/1mvEiBaFbWAeYe8/6LJd9II OU1w9bDmjfZWYFUXs+j2VF76ueZQ+kz69XDKZUGtkqN76m1AL8lGDurj5jxvyllF VJns8d9q2nr2q9PferfajK6rkOIPaTpwKblxZHUgobCyOitZaiZM0NgF733TsNM6 HXmhDhkcn7T81+SiHVfigJ/nxo9UgU4zNJCODF3WZIwGIj3FbxvCOpdCYi2NhCO8 oLcgDk57tpoKpB3gvAmYVQHP9FIepFa/WAWyPIADA7PkpYrwgc4v+cLEHXpd8SRv viLLIa5QuNdMeaK+Md9OKmKZFd7uFD9jiMtmdm6IpEVDDjMgoteb2XSoEtNebmtY MfbW4okn118a2dFKKaPTKcXVW/a5FRp2JGfB0A58RQHaJWj3JsY1bFn/xWPEpTOA IWB/HHMln0LYTL2AXN9HcaL1jnGI1Wq5eWBurX+cXQ/ij1A6jfoRKYglx7AQqOHj iWcGYtKLLJCgiWFnLSwcljZhfoYr0/z7rhns6yo7/vhN0riy+M84OgN4HbAmUzc1 Bgy9PnJTNo8= =8PtJ -----END PGP SIGNATURE----- Merge tag 'dt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc Pull ARM SoC device tree changes from Arnd Bergmann: "These changes from 30 individual branches for the most part update device tree files, but there are also a few source code changes that have crept in this time, usually in order to atomically move over a driver from using hardcoded data to DT probing. A number of platforms change their DT files to use the C preprocessor, which is causing a bit of churn, but that is hopefully only this once" * tag 'dt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (372 commits) ARM: at91: dt: rm9200ek: add spi support ARM: at91: dt: rm9200: add spi support ARM: at91/DT: at91sam9n12: add SPI DMA client infos ARM: at91/DT: sama5d3: add SPI DMA client infos ARM: at91/DT: fix SPI compatibility string ARM: Kirkwood: Fix the internal register ranges translation ARM: dts: bcm281xx: change comment to C89 style ARM: mmc: bcm281xx SDHCI driver (dt mods) ARM: nomadik: add the new clocks to the device tree clk: nomadik: implement the Nomadik clocks properly ARM: dts: omap5-uevm: Provide USB Host PHY clock frequency ARM: dts: omap4-panda: Fix DVI EDID reads ARM: dts: omap4-panda: Add USB Host support arm: mvebu: enable mini-PCIe connectors on Armada 370 RD ARM: shmobile: irqpin: add a DT property to enable masking on parent ARM: dts: AM43x EPOS EVM support ARM: dts: OMAP5: Add bandgap DT entry ARM: dts: AM33XX: Add pinmux configuration for CPSW to am335x EVM ARM: dts: AM33XX: Add pinmux configuration for CPSW to EVMsk ARM: dts: AM33XX: Add pinmux configuration for CPSW to beaglebone ...
106 lines
3.6 KiB
Makefile
106 lines
3.6 KiB
Makefile
#
|
|
# Makefile for the linux kernel.
|
|
#
|
|
|
|
obj-y := irq.o gpio.o setup.o
|
|
obj-m :=
|
|
obj-n :=
|
|
obj- :=
|
|
|
|
obj-$(CONFIG_AT91_PMC_UNIT) += clock.o
|
|
obj-$(CONFIG_AT91_SAM9_ALT_RESET) += at91sam9_alt_reset.o
|
|
obj-$(CONFIG_AT91_SAM9G45_RESET) += at91sam9g45_reset.o
|
|
obj-$(CONFIG_AT91_SAM9_TIME) += at91sam926x_time.o
|
|
obj-$(CONFIG_SOC_AT91SAM9) += sam9_smc.o
|
|
|
|
# CPU-specific support
|
|
obj-$(CONFIG_SOC_AT91RM9200) += at91rm9200.o at91rm9200_time.o
|
|
obj-$(CONFIG_SOC_AT91SAM9260) += at91sam9260.o
|
|
obj-$(CONFIG_SOC_AT91SAM9261) += at91sam9261.o
|
|
obj-$(CONFIG_SOC_AT91SAM9263) += at91sam9263.o
|
|
obj-$(CONFIG_SOC_AT91SAM9G45) += at91sam9g45.o
|
|
obj-$(CONFIG_SOC_AT91SAM9N12) += at91sam9n12.o
|
|
obj-$(CONFIG_SOC_AT91SAM9X5) += at91sam9x5.o
|
|
obj-$(CONFIG_SOC_AT91SAM9RL) += at91sam9rl.o
|
|
obj-$(CONFIG_SOC_SAMA5D3) += sama5d3.o
|
|
|
|
obj-$(CONFIG_ARCH_AT91RM9200) += at91rm9200_devices.o
|
|
obj-$(CONFIG_ARCH_AT91SAM9260) += at91sam9260_devices.o
|
|
obj-$(CONFIG_ARCH_AT91SAM9261) += at91sam9261_devices.o
|
|
obj-$(CONFIG_ARCH_AT91SAM9263) += at91sam9263_devices.o
|
|
obj-$(CONFIG_ARCH_AT91SAM9RL) += at91sam9rl_devices.o
|
|
obj-$(CONFIG_ARCH_AT91SAM9G45) += at91sam9g45_devices.o
|
|
obj-$(CONFIG_ARCH_AT91X40) += at91x40.o at91x40_time.o
|
|
|
|
# AT91RM9200 board-specific support
|
|
obj-$(CONFIG_MACH_ONEARM) += board-1arm.o
|
|
obj-$(CONFIG_MACH_AT91RM9200EK) += board-rm9200ek.o
|
|
obj-$(CONFIG_MACH_CSB337) += board-csb337.o
|
|
obj-$(CONFIG_MACH_CSB637) += board-csb637.o
|
|
obj-$(CONFIG_MACH_CARMEVA) += board-carmeva.o
|
|
obj-$(CONFIG_MACH_KB9200) += board-kb9202.o
|
|
obj-$(CONFIG_MACH_ATEB9200) += board-eb9200.o
|
|
obj-$(CONFIG_MACH_KAFA) += board-kafa.o
|
|
obj-$(CONFIG_MACH_PICOTUX2XX) += board-picotux200.o
|
|
obj-$(CONFIG_MACH_ECBAT91) += board-ecbat91.o
|
|
obj-$(CONFIG_MACH_YL9200) += board-yl-9200.o
|
|
obj-$(CONFIG_MACH_CPUAT91) += board-cpuat91.o
|
|
obj-$(CONFIG_MACH_ECO920) += board-eco920.o
|
|
obj-$(CONFIG_MACH_RSI_EWS) += board-rsi-ews.o
|
|
|
|
# AT91SAM9260 board-specific support
|
|
obj-$(CONFIG_MACH_AT91SAM9260EK) += board-sam9260ek.o
|
|
obj-$(CONFIG_MACH_CAM60) += board-cam60.o
|
|
obj-$(CONFIG_MACH_SAM9_L9260) += board-sam9-l9260.o
|
|
obj-$(CONFIG_MACH_QIL_A9260) += board-qil-a9260.o
|
|
obj-$(CONFIG_MACH_AFEB9260) += board-afeb-9260v1.o
|
|
obj-$(CONFIG_MACH_CPU9260) += board-cpu9krea.o
|
|
obj-$(CONFIG_MACH_FLEXIBITY) += board-flexibity.o
|
|
|
|
# AT91SAM9261 board-specific support
|
|
obj-$(CONFIG_MACH_AT91SAM9261EK) += board-sam9261ek.o
|
|
obj-$(CONFIG_MACH_AT91SAM9G10EK) += board-sam9261ek.o
|
|
|
|
# AT91SAM9263 board-specific support
|
|
obj-$(CONFIG_MACH_AT91SAM9263EK) += board-sam9263ek.o
|
|
|
|
# AT91SAM9RL board-specific support
|
|
obj-$(CONFIG_MACH_AT91SAM9RLEK) += board-sam9rlek.o
|
|
|
|
# AT91SAM9G20 board-specific support
|
|
obj-$(CONFIG_MACH_AT91SAM9G20EK) += board-sam9g20ek.o
|
|
obj-$(CONFIG_MACH_CPU9G20) += board-cpu9krea.o
|
|
obj-$(CONFIG_MACH_ACMENETUSFOXG20) += board-foxg20.o
|
|
obj-$(CONFIG_MACH_STAMP9G20) += board-stamp9g20.o
|
|
obj-$(CONFIG_MACH_PORTUXG20) += board-stamp9g20.o
|
|
obj-$(CONFIG_MACH_PCONTROL_G20) += board-pcontrol-g20.o board-stamp9g20.o
|
|
obj-$(CONFIG_MACH_GSIA18S) += board-gsia18s.o board-stamp9g20.o
|
|
|
|
# AT91SAM9260/AT91SAM9G20 board-specific support
|
|
obj-$(CONFIG_MACH_SNAPPER_9260) += board-snapper9260.o
|
|
|
|
# AT91SAM9G45 board-specific support
|
|
obj-$(CONFIG_MACH_AT91SAM9M10G45EK) += board-sam9m10g45ek.o
|
|
|
|
# AT91SAM board with device-tree
|
|
obj-$(CONFIG_MACH_AT91RM9200_DT) += board-dt-rm9200.o
|
|
obj-$(CONFIG_MACH_AT91SAM9_DT) += board-dt-sam9.o
|
|
|
|
# SAMA5 board with device-tree
|
|
obj-$(CONFIG_MACH_SAMA5_DT) += board-dt-sama5.o
|
|
|
|
# AT91X40 board-specific support
|
|
obj-$(CONFIG_MACH_AT91EB01) += board-eb01.o
|
|
|
|
# Drivers
|
|
obj-y += leds.o
|
|
|
|
# Power Management
|
|
obj-$(CONFIG_PM) += pm.o
|
|
obj-$(CONFIG_AT91_SLOW_CLOCK) += pm_slowclock.o
|
|
obj-$(CONFIG_CPU_IDLE) += cpuidle.o
|
|
|
|
ifeq ($(CONFIG_PM_DEBUG),y)
|
|
CFLAGS_pm.o += -DDEBUG
|
|
endif
|