| Message ID | CACUy__WDA1prfdP1erbSPYJt4JkG6oQbeEwK0fcaQrew1+jsFw@mail.gmail.com |
|---|---|
| State | Accepted |
| Delegated to: | Tom Rini |
| Headers | show |
On Sat, Jan 16, 2016 at 09:45:19PM +0100, Daniel Schwierzeck wrote: > Hi Tom, > > please pull the first bunch of MIPS updates. > > There is a possible merge conflict in dts/Makefile due to my patch [1] > in this PR and Thomas' patch [2] waiting in u-boot-fdt tree. > > [1] http://patchwork.ozlabs.org/patch/566695/ > [2] http://patchwork.ozlabs.org/patch/563669/ > > > The following changes since commit 782acf7b52db6bec1a796773e3033b4afcd6c9e2: > > Merge git://git.denx.de/u-boot-rockchip (2016-01-15 08:11:15 -0500) > > are available in the git repository at: > > git://git.denx.de/u-boot-mips.git master > > for you to fetch changes up to 0e0efb40b874633360967f532eb1ed59ad02adbe: > > MIPS: implement bit manipulating I/O accessors (2016-01-16 21:06:46 +0100) > Applied to u-boot/master, thanks!
Hi Tom, please pull the first bunch of MIPS updates. There is a possible merge conflict in dts/Makefile due to my patch [1] in this PR and Thomas' patch [2] waiting in u-boot-fdt tree. [1] http://patchwork.ozlabs.org/patch/566695/ [2] http://patchwork.ozlabs.org/patch/563669/ The following changes since commit 782acf7b52db6bec1a796773e3033b4afcd6c9e2: Merge git://git.denx.de/u-boot-rockchip (2016-01-15 08:11:15 -0500) are available in the git repository at: git://git.denx.de/u-boot-mips.git master for you to fetch changes up to 0e0efb40b874633360967f532eb1ed59ad02adbe: MIPS: implement bit manipulating I/O accessors (2016-01-16 21:06:46 +0100) ---------------------------------------------------------------- Daniel Schwierzeck (16): MIPS: fix annotation of _start and relocate_code MIPS: create .text sub-sections for assembler functions MIPS: do not build position-independent executables for SPL MIPS: add initial infrastructure for device-tree files MIPS: Kconfig: refactor machine setup MIPS: au1x00: move SoC header files to arch/mips/mach-au1x00/include/mach/ MIPS: Kconfig: optimize gcc -march and -mtune setup MIPS: malta: do not pull in target header files in config.h MIPS: malta: fix IO accessor call MIPS: vct: fix I/O accessor calls MIPS: kconfig: add option for MIPS_L1_CACHE_SHIFT net: pcnet: refactor mapping of virtual addresses to physical ones MIPS: sync I/O related header files with linux-4.4 MIPS: sync processor and register definitions with linux-4.4 MIPS: fix SPDX license identifier in remaining arch header files MIPS: implement bit manipulating I/O accessors Purna Chandra Mandal (1): MIPS: add asm/gpio.h to fix compilation error with CONFIG_CMD_GPIO. arch/Kconfig | 1 + arch/mips/Kconfig | 33 ++- arch/mips/Makefile | 23 +- arch/mips/config.mk | 25 +- arch/mips/cpu/start.S | 12 +- arch/mips/dts/.gitignore | 1 + arch/mips/dts/Makefile | 16 ++ arch/mips/dts/include/dt-bindings | 1 + arch/mips/dts/skeleton.dtsi | 23 ++ arch/mips/include/asm/addrspace.h | 10 +- arch/mips/include/asm/asm.h | 126 +++++----- arch/mips/include/asm/bitops.h | 6 +- arch/mips/include/asm/byteorder.h | 6 +- arch/mips/include/asm/cache.h | 14 +- arch/mips/include/asm/cachectl.h | 6 +- arch/mips/include/asm/cacheops.h | 6 +- arch/mips/include/asm/const.h | 31 +++ arch/mips/include/asm/cpu-features.h | 30 +++ arch/mips/include/asm/gpio.h | 1 + arch/mips/include/asm/io.h | 814 +++++++++++++++++++++++++++++++++---------------------------- arch/mips/include/asm/isadep.h | 6 +- arch/mips/include/asm/mach-generic/cpu-feature-overrides.h | 11 + arch/mips/include/asm/mach-generic/ioremap.h | 32 +++ arch/mips/include/asm/mach-generic/mangle-port.h | 50 ++++ arch/mips/include/asm/mach-generic/spaces.h | 102 ++++++++ arch/mips/include/asm/mipsregs.h | 1495 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------- arch/mips/include/asm/pgtable-bits.h | 283 ++++++++++++++++++++++ arch/mips/include/asm/posix_types.h | 9 +- arch/mips/include/asm/processor.h | 6 +- arch/mips/include/asm/ptrace.h | 99 +++++--- arch/mips/include/asm/reboot.h | 6 +- arch/mips/include/asm/reg.h | 6 +- arch/mips/include/asm/regdef.h | 12 +- arch/mips/include/asm/sgidefs.h | 6 +- arch/mips/include/asm/string.h | 6 +- arch/mips/include/asm/system.h | 6 +- arch/mips/include/asm/types.h | 6 +- arch/mips/include/asm/unaligned.h | 6 +- arch/mips/lib/cache.c | 4 +- arch/mips/lib/cache_init.S | 16 +- arch/mips/mach-au1x00/au1x00_eth.c | 2 +- arch/mips/mach-au1x00/au1x00_serial.c | 2 +- arch/mips/mach-au1x00/au1x00_usb_ohci.c | 2 +- arch/mips/mach-au1x00/config.mk | 8 - arch/mips/{include/asm => mach-au1x00/include/mach}/au1x00.h | 0 board/dbau1x00/dbau1x00.c | 2 +- board/dbau1x00/lowlevel_init.S | 2 +- board/imgtec/malta/malta.c | 3 +- board/micronas/vct/vct.h | 6 +- board/pb1x00/lowlevel_init.S | 2 +- board/pb1x00/pb1x00.c | 2 +- drivers/net/pcnet.c | 28 ++- dts/Makefile | 2 +- include/configs/malta.h | 9 +- 54 files changed, 2396 insertions(+), 1026 deletions(-) create mode 100644 arch/mips/dts/.gitignore create mode 100644 arch/mips/dts/Makefile create mode 120000 arch/mips/dts/include/dt-bindings create mode 100644 arch/mips/dts/skeleton.dtsi create mode 100644 arch/mips/include/asm/const.h create mode 100644 arch/mips/include/asm/cpu-features.h create mode 100644 arch/mips/include/asm/gpio.h create mode 100644 arch/mips/include/asm/mach-generic/cpu-feature-overrides.h create mode 100644 arch/mips/include/asm/mach-generic/ioremap.h create mode 100644 arch/mips/include/asm/mach-generic/mangle-port.h create mode 100644 arch/mips/include/asm/mach-generic/spaces.h create mode 100644 arch/mips/include/asm/pgtable-bits.h delete mode 100644 arch/mips/mach-au1x00/config.mk rename arch/mips/{include/asm => mach-au1x00/include/mach}/au1x00.h (100%)