Commit 90de1fb8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'xtensa-20181101' of git://github.com/jcmvbkbc/linux-xtensa 

Pull Xtensa fixes and cleanups from Max Filippov:

 - use ZONE_NORMAL instead of ZONE_DMA

 - fix Image.elf build error caused by assignment of incorrect address
   to the .note.Linux section

 - clean up debug and property sections in the vmlinux.lds.S

* tag 'xtensa-20181101' of git://github.com/jcmvbkbc/linux-xtensa:
  xtensa: clean up xtensa-specific property sections
  xtensa: use DWARF_DEBUG in the vmlinux.lds.S
  xtensa: add NOTES section to the linker script
  xtensa: remove ZONE_DMA
parents 2d6bb6ad 960b82c3

arch/xtensa/Kconfig

+0 −3
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

config ZONE_DMA

	def_bool y



config XTENSA

	def_bool y

	select ARCH_HAS_SG_CHAIN

arch/xtensa/boot/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ uImage: $(obj)/uImage 
boot-elf boot-redboot: $(addprefix $(obj)/,$(subdir-y))

	$(Q)$(MAKE) $(build)=$(obj)/$@ $(MAKECMDGOALS)



OBJCOPYFLAGS = --strip-all -R .comment -R .note.gnu.build-id -O binary

OBJCOPYFLAGS = --strip-all -R .comment -R .notes -O binary



vmlinux.bin: vmlinux FORCE

	$(call if_changed,objcopy)

arch/xtensa/kernel/vmlinux.lds.S

+5 −31
Original line number Diff line number Diff line
@@ -131,6 +131,7 @@ SECTIONS 
  .fixup   : { *(.fixup) }



  EXCEPTION_TABLE(16)

  NOTES

  /* Data section */



  _sdata = .;
@@ -296,38 +297,11 @@ SECTIONS 


  _end = .;



  .xt.lit : { *(.xt.lit) }

  .xt.prop : { *(.xt.prop) }



  .debug  0 :  { *(.debug) }

  .line  0 :  { *(.line) }

  .debug_srcinfo  0 :  { *(.debug_srcinfo) }

  .debug_sfnames  0 :  { *(.debug_sfnames) }

  .debug_aranges  0 :  { *(.debug_aranges) }

  .debug_pubnames  0 :  { *(.debug_pubnames) }

  .debug_info  0 :  { *(.debug_info) }

  .debug_abbrev  0 :  { *(.debug_abbrev) }

  .debug_line  0 :  { *(.debug_line) }

  .debug_frame  0 :  { *(.debug_frame) }

  .debug_str  0 :  { *(.debug_str) }

  .debug_loc  0 :  { *(.debug_loc) }

  .debug_macinfo  0 :  { *(.debug_macinfo) }

  .debug_weaknames  0 :  { *(.debug_weaknames) }

  .debug_funcnames  0 :  { *(.debug_funcnames) }

  .debug_typenames  0 :  { *(.debug_typenames) }

  .debug_varnames  0 :  { *(.debug_varnames) }



  .xt.insn 0 :

  {

    *(.xt.insn)

    *(.gnu.linkonce.x*)

  }

  DWARF_DEBUG



  .xt.lit 0 :

  {

    *(.xt.lit)

    *(.gnu.linkonce.p*)

  }

  .xt.prop 0 : { KEEP(*(.xt.prop .xt.prop.* .gnu.linkonce.prop.*)) }

  .xt.insn 0 : { KEEP(*(.xt.insn .xt.insn.* .gnu.linkonce.x*)) }

  .xt.lit  0 : { KEEP(*(.xt.lit  .xt.lit.*  .gnu.linkonce.p*)) }



  /* Sections to be discarded */

  DISCARDS

arch/xtensa/mm/init.c

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ void __init zones_init(void) 
{

	/* All pages are DMA-able, so we put them all in the DMA zone. */

	unsigned long zones_size[MAX_NR_ZONES] = {

		[ZONE_DMA] = max_low_pfn - ARCH_PFN_OFFSET,

		[ZONE_NORMAL] = max_low_pfn - ARCH_PFN_OFFSET,

#ifdef CONFIG_HIGHMEM

		[ZONE_HIGHMEM] = max_pfn - max_low_pfn,

#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE