openwrt/upstream - upstream openwrt

diff options

author	Alexandru Ardelean <ardeleanalex@gmail.com>	2016-12-12 14:20:58 +0200
committer	Felix Fietkau <nbd@nbd.name>	2016-12-22 16:42:20 +0100
commit	acfb06783500a6364b3e473b6c02d06156829f70 (patch)
tree	7e8b82bf810d6033ddfdf4abe5ca97f556363599 /package/kernel/button-hotplug
parent	1831e616999cc081c83219fc504f4e73eb098612 (diff)
download	upstream-acfb06783500a6364b3e473b6c02d06156829f70.tar.gz upstream-acfb06783500a6364b3e473b6c02d06156829f70.tar.bz2 upstream-acfb06783500a6364b3e473b6c02d06156829f70.zip

gettext-full: enforce only static lib on the host build

Sometimes I'm getting error on the host-side build: ``` /usr/lib64/gcc/x86_64-suse-linux/4.8/../../../../x86_64-suse-linux/bin/ld: /home/sandu/work/lede/staging_dir/host/lib/liblzma.a(liblzma_la-common.o): relocation R_X86_64_32 against `.rodata.str1.1' can not be used when making a shared object; recompile with -fPIC /home/sandu/work/lede/staging_dir/host/lib/liblzma.a: error adding symbols: Bad value collect2: error: ld returned 1 exit status Makefile:2847: recipe for target 'libgettextlib.la' failed make[9]: *** [libgettextlib.la] Error 1 make[9]: Leaving directory '/home/sandu/work/lede/build_dir/target-x86_64_musl-1.1.15/host/gettext-0.19.8.1/gettext-tools/gnulib-lib' Makefile:2597: recipe for target 'all' failed ``` Disabling the shared-lib build, seems to fix this. This is when building glib2 on the host-side. glib2 is required by newer QEMU package [which is in the feeds]. Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>

Diffstat (limited to 'package/kernel/button-hotplug')

0 files changed, 0 insertions, 0 deletions

From f888824d352df894ab721a5ca067b0313500efe7 Mon Sep 17 00:00:00 2001 From: Jonas Gorski <jonas.gorski@gmail.com> Date: Thu, 3 May 2012 12:17:54 +0200 Subject: [PATCH 38/59] MIPS: BCM63XX: store the flash type in global variable --- arch/mips/bcm63xx/dev-flash.c | 36 +++++++++++++------ .../include/asm/mach-bcm63xx/bcm63xx_dev_flash.h | 2 + 2 files changed, 26 insertions(+), 12 deletions(-) --- a/arch/mips/bcm63xx/dev-flash.c +++ b/arch/mips/bcm63xx/dev-flash.c @@ -25,6 +25,8 @@ #include <bcm63xx_regs.h> #include <bcm63xx_io.h> +int bcm63xx_attached_flash = -1; + static struct mtd_partition mtd_partitions[] = { { .name = "cfe", @@ -86,27 +88,31 @@ static int __init bcm63xx_detect_flash_t bcm63xx_spi_flash_info[0].max_speed_hz = 16666667; if (val & STRAPBUS_6328_BOOT_SEL_SERIAL) - return BCM63XX_FLASH_TYPE_SERIAL; + bcm63xx_attached_flash = BCM63XX_FLASH_TYPE_SERIAL; else - return BCM63XX_FLASH_TYPE_NAND; + bcm63xx_attached_flash = BCM63XX_FLASH_TYPE_NAND; + break; case BCM6338_CPU_ID: case BCM6345_CPU_ID: case BCM6348_CPU_ID: /* no way to auto detect so assume parallel */ - return BCM63XX_FLASH_TYPE_PARALLEL; + bcm63xx_attached_flash = BCM63XX_FLASH_TYPE_PARALLEL; + break; case BCM3368_CPU_ID: case BCM6358_CPU_ID: val = bcm_gpio_readl(GPIO_STRAPBUS_REG); if (val & STRAPBUS_6358_BOOT_SEL_PARALLEL) - return BCM63XX_FLASH_TYPE_PARALLEL; + bcm63xx_attached_flash = BCM63XX_FLASH_TYPE_PARALLEL; else - return BCM63XX_FLASH_TYPE_SERIAL; + bcm63xx_attached_flash = BCM63XX_FLASH_TYPE_SERIAL; + break; case BCM6362_CPU_ID: val = bcm_misc_readl(MISC_STRAPBUS_6362_REG); if (val & STRAPBUS_6362_BOOT_SEL_SERIAL) - return BCM63XX_FLASH_TYPE_SERIAL; + bcm63xx_attached_flash = BCM63XX_FLASH_TYPE_SERIAL; else - return BCM63XX_FLASH_TYPE_NAND; + bcm63xx_attached_flash = BCM63XX_FLASH_TYPE_NAND; + break; case BCM6368_CPU_ID: val = bcm_gpio_readl(GPIO_STRAPBUS_REG); if (val & STRAPBUS_6368_SPI_CLK_FAST) @@ -114,25 +120,32 @@ static int __init bcm63xx_detect_flash_t switch (val & STRAPBUS_6368_BOOT_SEL_MASK) { case STRAPBUS_6368_BOOT_SEL_NAND: - return BCM63XX_FLASH_TYPE_NAND; + bcm63xx_attached_flash = BCM63XX_FLASH_TYPE_NAND; + break; case STRAPBUS_6368_BOOT_SEL_SERIAL: - return BCM63XX_FLASH_TYPE_SERIAL; + bcm63xx_attached_flash = BCM63XX_FLASH_TYPE_SERIAL; + break; case STRAPBUS_6368_BOOT_SEL_PARALLEL: - return BCM63XX_FLASH_TYPE_PARALLEL; + bcm63xx_attached_flash = BCM63XX_FLASH_TYPE_PARALLEL; + break; + default: + return -EINVAL; } default: return -EINVAL; } + + return 0; } int __init bcm63xx_flash_register(void) { - int flash_type; u32 val; - flash_type = bcm63xx_detect_flash_type(); - switch (flash_type) { + bcm63xx_detect_flash_type(); + + switch (bcm63xx_attached_flash) { case BCM63XX_FLASH_TYPE_PARALLEL: /* read base address of boot chip select (0) */ val = bcm_mpi_readl(MPI_CSBASE_REG(0)); @@ -155,7 +168,7 @@ int __init bcm63xx_flash_register(void) return -ENODEV; default: pr_err("flash detection failed for BCM%x: %d\n", - bcm63xx_get_cpu_id(), flash_type); + bcm63xx_get_cpu_id(), bcm63xx_attached_flash); return -ENODEV; } } --- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_flash.h +++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_flash.h @@ -7,6 +7,8 @@ enum { BCM63XX_FLASH_TYPE_NAND, }; +extern int bcm63xx_attached_flash; + int __init bcm63xx_flash_register(void); #endif /* __BCM63XX_FLASH_H */


context:
space:
mode: