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

Commit 627f4b3e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'microblaze-3.14-rc1' of git://git.monstr.eu/linux-2.6-microblaze 

Pull microblaze patches from Michal Simek:
 - add CCF support
 - fix BS=0 compilation
 - wire up defconfig
 - some minor cleanups and fixes

* tag 'microblaze-3.14-rc1' of git://git.monstr.eu/linux-2.6-microblaze:
  microblaze: Add missing v8.50.a version
  microblaze: Fix missing bracket in printk
  microblaze: Fix compilation error for BS=0
  microblaze: Disable stack protection from bootloader
  microblaze: Define read/write{b,w,l}_relaxed MMIO
  microblaze: timer: Do not initialized system timer twice
  microblaze: timer: Use generic sched_clock implementation
  microblaze: Add NOTES section to linker script
  microblaze: Add support for CCF
  microblaze: Simplify fcpu helper function
  microblaze/uapi: Use Kbuild logic to include <asm-generic/types.h>
  microblaze: Remove duplicate declarations of _stext[] and _etext[]
  microblaze: Remove _fdt_start casts
  microblaze: Wire up defconfig to mmu_defconfig
parents e770d73c c0d68cea

arch/microblaze/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -26,6 +26,8 @@ config MICROBLAZE 
	select GENERIC_CPU_DEVICES

	select GENERIC_ATOMIC64

	select GENERIC_CLOCKEVENTS

	select COMMON_CLK

	select GENERIC_SCHED_CLOCK

	select GENERIC_IDLE_POLL_SETUP

	select MODULES_USE_ELF_RELA

	select CLONE_BACKWARDS3

arch/microblaze/Makefile

+2 −0
Original line number Diff line number Diff line 
KBUILD_DEFCONFIG := mmu_defconfig



ifeq ($(CONFIG_MMU),y)

UTS_SYSNAME = -DUTS_SYSNAME=\"Linux\"

else

arch/microblaze/include/asm/cpuinfo.h

+6 −3
Original line number Diff line number Diff line
@@ -91,15 +91,18 @@ extern struct cpuinfo cpuinfo; 


/* fwd declarations of the various CPUinfo populators */

void setup_cpuinfo(void);

void setup_cpuinfo_clk(void);



void set_cpuinfo_static(struct cpuinfo *ci, struct device_node *cpu);

void set_cpuinfo_pvr_full(struct cpuinfo *ci, struct device_node *cpu);



static inline unsigned int fcpu(struct device_node *cpu, char *n)

{

	const __be32 *val;

	return (val = of_get_property(cpu, n, NULL)) ?

							be32_to_cpup(val) : 0;

	u32 val = 0;



	of_property_read_u32(cpu, n, &val);



	return val;

}



#endif /* _ASM_MICROBLAZE_CPUINFO_H */

arch/microblaze/include/asm/io.h

+8 −0
Original line number Diff line number Diff line
@@ -342,4 +342,12 @@ static inline void outsl(unsigned long addr, const void *buffer, int count) 
#define iowrite32_rep(p, src, count) \

	outsl((unsigned long) (p), (src), (count))



#define readb_relaxed	readb

#define readw_relaxed	readw

#define readl_relaxed	readl



#define writeb_relaxed	writeb

#define writew_relaxed	writew

#define writel_relaxed	writel



#endif /* _ASM_MICROBLAZE_IO_H */

arch/microblaze/include/asm/sections.h

+0 −1
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 
# ifndef __ASSEMBLY__

extern char _ssbss[], _esbss[];

extern unsigned long __ivt_start[], __ivt_end[];

extern char _etext[], _stext[];



extern u32 _fdt_start[], _fdt_end[];