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

Commit d4d37bde authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus 

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
  MIPS: PowerTV: Fix support for timer interrupts with > 64 external IRQs
  MIPS: PowerTV: Streamline access to platform device registers
  MIPS: Fix vmlinuz build for 32bit-only math shells
  MIPS: Add support of LZO-compressed kernels
parents 551e28db 010c108d

arch/mips/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -1311,6 +1311,7 @@ config SYS_SUPPORTS_ZBOOT 
	select HAVE_KERNEL_GZIP

	select HAVE_KERNEL_BZIP2

	select HAVE_KERNEL_LZMA

	select HAVE_KERNEL_LZO



config SYS_SUPPORTS_ZBOOT_UART16550

	bool

arch/mips/boot/compressed/Makefile

+7 −2
Original line number Diff line number Diff line
@@ -14,8 +14,11 @@ 


# compressed kernel load addr: VMLINUZ_LOAD_ADDRESS > VMLINUX_LOAD_ADDRESS + VMLINUX_SIZE

VMLINUX_SIZE := $(shell wc -c $(objtree)/$(KBUILD_IMAGE) 2>/dev/null | cut -d' ' -f1)

VMLINUX_SIZE := $(shell [ -n "$(VMLINUX_SIZE)" ] && echo $$(($(VMLINUX_SIZE) + (65536 - $(VMLINUX_SIZE) % 65536))))

VMLINUZ_LOAD_ADDRESS := 0x$(shell [ -n "$(VMLINUX_SIZE)" ] && printf %x $$(($(VMLINUX_LOAD_ADDRESS) + $(VMLINUX_SIZE))))

VMLINUX_SIZE := $(shell [ -n "$(VMLINUX_SIZE)" ] && echo -n $$(($(VMLINUX_SIZE) + (65536 - $(VMLINUX_SIZE) % 65536))))

# VMLINUZ_LOAD_ADDRESS = concat "high32 of VMLINUX_LOAD_ADDRESS" and "(low32 of VMLINUX_LOAD_ADDRESS) + VMLINUX_SIZE"

HIGH32 := $(shell A=$(VMLINUX_LOAD_ADDRESS); [ $${\#A} -gt 10 ] && expr substr "$(VMLINUX_LOAD_ADDRESS)" 3 $$(($${\#A} - 10)))

LOW32 := $(shell [ -n "$(HIGH32)" ] && A=11 || A=3; expr substr "$(VMLINUX_LOAD_ADDRESS)" $${A} 8)

VMLINUZ_LOAD_ADDRESS := 0x$(shell [ -n "$(VMLINUX_SIZE)" -a -n "$(LOW32)" ] && printf "$(HIGH32)%08x" $$(($(VMLINUX_SIZE) + 0x$(LOW32))))



# set the default size of the mallocing area for decompressing

BOOT_HEAP_SIZE := 0x400000
@@ -41,9 +44,11 @@ $(obj)/vmlinux.bin: $(KBUILD_IMAGE) 
suffix_$(CONFIG_KERNEL_GZIP)  = gz

suffix_$(CONFIG_KERNEL_BZIP2) = bz2

suffix_$(CONFIG_KERNEL_LZMA)  = lzma

suffix_$(CONFIG_KERNEL_LZO)   = lzo

tool_$(CONFIG_KERNEL_GZIP)    = gzip

tool_$(CONFIG_KERNEL_BZIP2)   = bzip2

tool_$(CONFIG_KERNEL_LZMA)    = lzma

tool_$(CONFIG_KERNEL_LZO)     = lzo

$(obj)/vmlinux.$(suffix_y): $(obj)/vmlinux.bin

	$(call if_changed,$(tool_y))

arch/mips/boot/compressed/decompress.c

+4 −0
Original line number Diff line number Diff line
@@ -77,6 +77,10 @@ void *memset(void *s, int c, size_t n) 
#include "../../../../lib/decompress_unlzma.c"

#endif



#ifdef CONFIG_KERNEL_LZO

#include "../../../../lib/decompress_unlzo.c"

#endif



void decompress_kernel(unsigned long boot_heap_start)

{

	int zimage_size;

arch/mips/include/asm/irq.h

+1 −0
Original line number Diff line number Diff line
@@ -135,6 +135,7 @@ extern void free_irqno(unsigned int irq); 
#define CP0_LEGACY_COMPARE_IRQ 7



extern int cp0_compare_irq;

extern int cp0_compare_irq_shift;

extern int cp0_perfcount_irq;



#endif /* _ASM_IRQ_H */

arch/mips/include/asm/mach-powertv/asic_reg_map.h

0 → 100644
+90 −0
Original line number Diff line number Diff line 
/*

 *				asic_reg_map.h

 *

 * A macro-enclosed list of the elements for the register_map structure for

 * use in defining and manipulating the structure.

 *

 * Copyright (C) 2009  Cisco Systems, Inc.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by

 * the Free Software Foundation; either version 2 of the License, or

 * (at your option) any later version.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 *

 * You should have received a copy of the GNU General Public License

 * along with this program; if not, write to the Free Software

 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA

 */



REGISTER_MAP_ELEMENT(eic_slow0_strt_add)

REGISTER_MAP_ELEMENT(eic_cfg_bits)

REGISTER_MAP_ELEMENT(eic_ready_status)

REGISTER_MAP_ELEMENT(chipver3)

REGISTER_MAP_ELEMENT(chipver2)

REGISTER_MAP_ELEMENT(chipver1)

REGISTER_MAP_ELEMENT(chipver0)

REGISTER_MAP_ELEMENT(uart1_intstat)

REGISTER_MAP_ELEMENT(uart1_inten)

REGISTER_MAP_ELEMENT(uart1_config1)

REGISTER_MAP_ELEMENT(uart1_config2)

REGISTER_MAP_ELEMENT(uart1_divisorhi)

REGISTER_MAP_ELEMENT(uart1_divisorlo)

REGISTER_MAP_ELEMENT(uart1_data)

REGISTER_MAP_ELEMENT(uart1_status)

REGISTER_MAP_ELEMENT(int_stat_3)

REGISTER_MAP_ELEMENT(int_stat_2)

REGISTER_MAP_ELEMENT(int_stat_1)

REGISTER_MAP_ELEMENT(int_stat_0)

REGISTER_MAP_ELEMENT(int_config)

REGISTER_MAP_ELEMENT(int_int_scan)

REGISTER_MAP_ELEMENT(ien_int_3)

REGISTER_MAP_ELEMENT(ien_int_2)

REGISTER_MAP_ELEMENT(ien_int_1)

REGISTER_MAP_ELEMENT(ien_int_0)

REGISTER_MAP_ELEMENT(int_level_3_3)

REGISTER_MAP_ELEMENT(int_level_3_2)

REGISTER_MAP_ELEMENT(int_level_3_1)

REGISTER_MAP_ELEMENT(int_level_3_0)

REGISTER_MAP_ELEMENT(int_level_2_3)

REGISTER_MAP_ELEMENT(int_level_2_2)

REGISTER_MAP_ELEMENT(int_level_2_1)

REGISTER_MAP_ELEMENT(int_level_2_0)

REGISTER_MAP_ELEMENT(int_level_1_3)

REGISTER_MAP_ELEMENT(int_level_1_2)

REGISTER_MAP_ELEMENT(int_level_1_1)

REGISTER_MAP_ELEMENT(int_level_1_0)

REGISTER_MAP_ELEMENT(int_level_0_3)

REGISTER_MAP_ELEMENT(int_level_0_2)

REGISTER_MAP_ELEMENT(int_level_0_1)

REGISTER_MAP_ELEMENT(int_level_0_0)

REGISTER_MAP_ELEMENT(int_docsis_en)

REGISTER_MAP_ELEMENT(mips_pll_setup)

REGISTER_MAP_ELEMENT(usb_fs)

REGISTER_MAP_ELEMENT(test_bus)

REGISTER_MAP_ELEMENT(crt_spare)

REGISTER_MAP_ELEMENT(usb2_ohci_int_mask)

REGISTER_MAP_ELEMENT(usb2_strap)

REGISTER_MAP_ELEMENT(ehci_hcapbase)

REGISTER_MAP_ELEMENT(ohci_hc_revision)

REGISTER_MAP_ELEMENT(bcm1_bs_lmi_steer)

REGISTER_MAP_ELEMENT(usb2_control)

REGISTER_MAP_ELEMENT(usb2_stbus_obc)

REGISTER_MAP_ELEMENT(usb2_stbus_mess_size)

REGISTER_MAP_ELEMENT(usb2_stbus_chunk_size)

REGISTER_MAP_ELEMENT(pcie_regs)

REGISTER_MAP_ELEMENT(tim_ch)

REGISTER_MAP_ELEMENT(tim_cl)

REGISTER_MAP_ELEMENT(gpio_dout)

REGISTER_MAP_ELEMENT(gpio_din)

REGISTER_MAP_ELEMENT(gpio_dir)

REGISTER_MAP_ELEMENT(watchdog)

REGISTER_MAP_ELEMENT(front_panel)

REGISTER_MAP_ELEMENT(misc_clk_ctl1)

REGISTER_MAP_ELEMENT(misc_clk_ctl2)

REGISTER_MAP_ELEMENT(crt_ext_ctl)

REGISTER_MAP_ELEMENT(register_maps)