Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 03787ff6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'xtensa-next-20140503' of git://github.com/czankel/xtensa-linux 

Pull Xtensa fixes from Chris Zankel:
 - Fixes allmodconfig, allnoconfig builds
 - Adds highmem support
 - Enables build-time exception table sorting.

* tag 'xtensa-next-20140503' of git://github.com/czankel/xtensa-linux:
  xtensa: ISS: don't depend on CONFIG_TTY
  xtensa: xt2000: drop redundant sysmem initialization
  xtensa: add support for KC705
  xtensa: xtfpga: introduce SoC I/O bus
  xtensa: add HIGHMEM support
  xtensa: optimize local_flush_tlb_kernel_range
  xtensa: dump sysmem from the bootmem_init
  xtensa: handle memmap kernel option
  xtensa: keep sysmem banks ordered in mem_reserve
  xtensa: keep sysmem banks ordered in add_sysmem_bank
  xtensa: split bootparam and kernel meminfo
  xtensa: enable sorting extable at build time
  xtensa: export __{invalidate,flush}_dcache_range
  xtensa: Export __invalidate_icache_range
parents 5575eeb7 55b441be

arch/xtensa/Kconfig

+19 −1
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ config XTENSA 
	select GENERIC_PCI_IOMAP

	select ARCH_WANT_IPC_PARSE_VERSION

	select ARCH_WANT_OPTIONAL_GPIOLIB

	select BUILDTIME_EXTABLE_SORT

	select CLONE_BACKWARDS

	select IRQ_DOMAIN

	select HAVE_OPROFILE
@@ -189,6 +190,24 @@ config INITIALIZE_XTENSA_MMU_INSIDE_VMLINUX 


	  If in doubt, say Y.



config HIGHMEM

	bool "High Memory Support"

	help

	  Linux can use the full amount of RAM in the system by

	  default. However, the default MMUv2 setup only maps the

	  lowermost 128 MB of memory linearly to the areas starting

	  at 0xd0000000 (cached) and 0xd8000000 (uncached).

	  When there are more than 128 MB memory in the system not

	  all of it can be "permanently mapped" by the kernel.

	  The physical memory that's not permanently mapped is called

	  "high memory".



	  If you are compiling a kernel which will never run on a

	  machine with more than 128 MB total physical RAM, answer

	  N here.



	  If unsure, say Y.



endmenu



config XTENSA_CALIBRATE_CCOUNT
@@ -224,7 +243,6 @@ choice 


config XTENSA_PLATFORM_ISS

	bool "ISS"

	depends on TTY

	select XTENSA_CALIBRATE_CCOUNT

	select SERIAL_CONSOLE

	help

arch/xtensa/boot/dts/kc705.dts

0 → 100644
+11 −0
Original line number Diff line number Diff line 
/dts-v1/;

/include/ "xtfpga.dtsi"

/include/ "xtfpga-flash-128m.dtsi"



/ {

	compatible = "cdns,xtensa-kc705";

	memory@0 {

		device_type = "memory";

		reg = <0x00000000 0x08000000>;

	};

};

arch/xtensa/boot/dts/xtfpga-flash-128m.dtsi

0 → 100644
+28 −0
Original line number Diff line number Diff line 
/ {

	soc {

		flash: flash@00000000 {

			#address-cells = <1>;

			#size-cells = <1>;

			compatible = "cfi-flash";

			reg = <0x00000000 0x08000000>;

			bank-width = <2>;

			device-width = <2>;

			partition@0x0 {

				label = "data";

				reg = <0x00000000 0x06000000>;

			};

			partition@0x6000000 {

				label = "boot loader area";

				reg = <0x06000000 0x00800000>;

			};

			partition@0x6800000 {

				label = "kernel image";

				reg = <0x06800000 0x017e0000>;

			};

			partition@0x7fe0000 {

				label = "boot environment";

				reg = <0x07fe0000 0x00020000>;

			};

		};

        };

};

arch/xtensa/boot/dts/xtfpga-flash-16m.dtsi

+25 −23
Original line number Diff line number Diff line 
/ {

	flash: flash@f8000000 {

	soc {

		flash: flash@08000000 {

			#address-cells = <1>;

			#size-cells = <1>;

			compatible = "cfi-flash";

		reg = <0xf8000000 0x01000000>;

			reg = <0x08000000 0x01000000>;

			bank-width = <2>;

			device-width = <2>;

			partition@0x0 {
@@ -24,3 +25,4 @@ 
			};

		};

	};

};

arch/xtensa/boot/dts/xtfpga-flash-4m.dtsi

+17 −15
Original line number Diff line number Diff line 
/ {

	flash: flash@f8000000 {

	soc {

		flash: flash@08000000 {

			#address-cells = <1>;

			#size-cells = <1>;

			compatible = "cfi-flash";

		reg = <0xf8000000 0x00400000>;

			reg = <0x08000000 0x00400000>;

			bank-width = <2>;

			device-width = <2>;

			partition@0x0 {
@@ -16,3 +17,4 @@ 
			};

		};

	};

};