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

Commit 12cceb62 authored by Paul Mundt's avatar Paul Mundt
Browse files

Merge branch 'sh/st-integration'

parents f1332786 05ecd5a1

arch/sh/Kconfig

+23 −4
Original line number Diff line number Diff line
@@ -767,12 +767,31 @@ config UBC_WAKEUP 


	  If unsure, say N.



config CMDLINE_BOOL

	bool "Default bootloader kernel arguments"

choice

	prompt "Kernel command line"

	optional

	default CMDLINE_OVERWRITE

	help

	  Setting this option allows the kernel command line arguments

	  to be set.



config CMDLINE_OVERWRITE

	bool "Overwrite bootloader kernel arguments"

	help

	  Given string will overwrite any arguments passed in by

	  a bootloader.



config CMDLINE_EXTEND

	bool "Extend bootloader kernel arguments"

	help

	  Given string will be concatenated with arguments passed in

	  by a bootloader.



endchoice



config CMDLINE

	string "Initial kernel command string"

	depends on CMDLINE_BOOL

	string "Kernel command line arguments string"

	depends on CMDLINE_OVERWRITE || CMDLINE_EXTEND

	default "console=ttySC1,115200"



endmenu

arch/sh/boot/compressed/head_32.S

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ startup: 
	bt	clear_bss

	sub	r0, r2

	mov.l	bss_start_addr, r0

	mov	#0xe0, r1

	mov	#0xffffffe0, r1

	and	r1, r0			! align cache line

	mov.l	text_start_addr, r3

	mov	r0, r1

arch/sh/drivers/pci/pci.c

+4 −0
Original line number Diff line number Diff line
@@ -295,6 +295,8 @@ int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma, 
			       vma->vm_page_prot);

}



#ifndef CONFIG_GENERIC_IOMAP



static void __iomem *ioport_map_pci(struct pci_dev *dev,

				    unsigned long port, unsigned int nr)

{
@@ -346,6 +348,8 @@ void pci_iounmap(struct pci_dev *dev, void __iomem *addr) 
}

EXPORT_SYMBOL(pci_iounmap);



#endif /* CONFIG_GENERIC_IOMAP */



#ifdef CONFIG_HOTPLUG

EXPORT_SYMBOL(pcibios_resource_to_bus);

EXPORT_SYMBOL(pcibios_bus_to_resource);

arch/sh/include/asm/Kbuild

+1 −1
Original line number Diff line number Diff line 
include include/asm-generic/Kbuild.asm



header-y += cpu-features.h

header-y += cachectl.h cpu-features.h



unifdef-y += unistd_32.h

unifdef-y += unistd_64.h

arch/sh/include/asm/cachectl.h

0 → 100644
+19 −0
Original line number Diff line number Diff line 
#ifndef _SH_CACHECTL_H

#define _SH_CACHECTL_H



/* Definitions for the cacheflush system call.  */



#define CACHEFLUSH_D_INVAL	0x1	/* invalidate (without write back) */

#define CACHEFLUSH_D_WB		0x2	/* write back (without invalidate) */

#define CACHEFLUSH_D_PURGE	0x3	/* writeback and invalidate */



#define CACHEFLUSH_I		0x4



/*

 * Options for cacheflush system call

 */

#define ICACHE	CACHEFLUSH_I		/* flush instruction cache */

#define DCACHE	CACHEFLUSH_D_PURGE	/* writeback and flush data cache */

#define BCACHE	(ICACHE|DCACHE)		/* flush both caches */



#endif /* _SH_CACHECTL_H */