coreboot February 2013

coreboot@coreboot.org

27 participants
790 discussions

Patch merged into coreboot/master: 0663dfd ARMv7: Fix include file names in memset & memcpy
by gerrit＠coreboot.org 15 Feb '13

15 Feb '13

the following patch was just integrated into master: commit 0663dfd3d5a64a0da3bf9114c0e8cb981d52871f Author: Stefan Reinauer <reinauer(a)chromium.org> Date: Thu Feb 14 15:55:07 2013 -0800 ARMv7: Fix include file names in memset & memcpy We don't have asm/ Change-Id: I7f80f47e9d7f457b7a5a64603c59b14d3b536a8c Signed-off-by: Stefan Reinauer <reinauer(a)google.com> Reviewed-on: http://review.coreboot.org/2403 Reviewed-by: Ronald G. Minnich <rminnich(a)gmail.com> Tested-by: build bot (Jenkins) Reviewed-by: David Hendricks <dhendrix(a)chromium.org> Build-Tested: build bot (Jenkins) at Fri Feb 15 01:30:49 2013, giving +1 Reviewed-By: David Hendricks <dhendrix(a)chromium.org> at Fri Feb 15 01:37:03 2013, giving +2 See http://review.coreboot.org/2403 for details. -gerrit

1 0

Patch merged into coreboot/master: 8a4ce28 ARMv7: Drop more unused files
by gerrit＠coreboot.org 15 Feb '13

15 Feb '13

the following patch was just integrated into master: commit 8a4ce28fc4b009d2ff1bd438b23545214c974a67 Author: Stefan Reinauer <reinauer(a)chromium.org> Date: Thu Feb 14 15:51:31 2013 -0800 ARMv7: Drop more unused files Change-Id: I0dd83f96d2a9598e9677d1b0b114229de6724287 Signed-off-by: Stefan Reinauer <reinauer(a)google.com> Reviewed-on: http://review.coreboot.org/2401 Tested-by: build bot (Jenkins) Reviewed-by: Ronald G. Minnich <rminnich(a)gmail.com> Build-Tested: build bot (Jenkins) at Fri Feb 15 01:14:45 2013, giving +1 Reviewed-By: Ronald G. Minnich <rminnich(a)gmail.com> at Fri Feb 15 01:15:06 2013, giving +2 See http://review.coreboot.org/2401 for details. -gerrit

1 0

Patch merged into coreboot/master: 2149ad3 libpayload: add a ldscript for arm
by gerrit＠coreboot.org 15 Feb '13

15 Feb '13

the following patch was just integrated into master: commit 2149ad3c9cf5c1f38ca9e217883855ef7e1e712a Author: Ronald G. Minnich <rminnich(a)gmail.com> Date: Thu Feb 14 15:14:58 2013 -0800 libpayload: add a ldscript for arm I think this needs to be its own ldscript. I'm pretty sure this one is going to need some work however. Is libpayload PIC? That would be best if so. Change-Id: I44578d70dfa72de527af8901a86583c2a60130ec Signed-off-by: Ronald G. Minnich <rminnich(a)gmail.com> Reviewed-on: http://review.coreboot.org/2398 Reviewed-by: David Hendricks <dhendrix(a)chromium.org> Tested-by: build bot (Jenkins) Build-Tested: build bot (Jenkins) at Fri Feb 15 00:45:45 2013, giving +1 Reviewed-By: David Hendricks <dhendrix(a)chromium.org> at Fri Feb 15 00:30:27 2013, giving +2 See http://review.coreboot.org/2398 for details. -gerrit

1 0

Patch merged into coreboot/master: 5ae44de Drop include/arch-generic/div64.h
by gerrit＠coreboot.org 15 Feb '13

15 Feb '13

the following patch was just integrated into master: commit 5ae44ded5cf5b8b9e0337feb6aa5ea42cda828ca Author: Stefan Reinauer <reinauer(a)chromium.org> Date: Thu Feb 14 15:50:53 2013 -0800 Drop include/arch-generic/div64.h It's unused. Change-Id: Id67ca754ff7ad148ff1ecd4f1e5c986a4e7585a8 Signed-off-by: Stefan Reinauer <reinauer(a)google.com> Reviewed-on: http://review.coreboot.org/2400 Tested-by: build bot (Jenkins) Reviewed-by: David Hendricks <dhendrix(a)chromium.org> Build-Tested: build bot (Jenkins) at Fri Feb 15 01:07:20 2013, giving +1 Reviewed-By: David Hendricks <dhendrix(a)chromium.org> at Fri Feb 15 01:11:07 2013, giving +2 See http://review.coreboot.org/2400 for details. -gerrit

1 0

New patch to review for coreboot: 91ffc22 ARMv7: Drop sr32, and wait_on_value
by Stefan Reinauer 15 Feb '13

15 Feb '13

Stefan Reinauer (stefan.reinauer(a)coreboot.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/2404 -gerrit commit 91ffc2262783fe59d7b51d41cff33e756ef75150 Author: Stefan Reinauer <reinauer(a)chromium.org> Date: Thu Feb 14 15:56:08 2013 -0800 ARMv7: Drop sr32, and wait_on_value They're unused. Also drop some unused defines in system.h Change-Id: Ia5afc3a676a4a94787041430f05d08f333033c73 Signed-off-by: Stefan Reinauer <reinauer(a)google.com> --- src/arch/armv7/include/system.h | 19 ++----------------- src/arch/armv7/lib/syslib.c | 31 ------------------------------- 2 files changed, 2 insertions(+), 48 deletions(-) diff --git a/src/arch/armv7/include/system.h b/src/arch/armv7/include/system.h index ddbab89..053df8d 100644 --- a/src/arch/armv7/include/system.h +++ b/src/arch/armv7/include/system.h @@ -2,17 +2,6 @@ #ifndef SYSTEM_H_ #define SYSTEM_H_ -#define CPU_ARCH_UNKNOWN 0 -#define CPU_ARCH_ARMv3 1 -#define CPU_ARCH_ARMv4 2 -#define CPU_ARCH_ARMv4T 3 -#define CPU_ARCH_ARMv5 4 -#define CPU_ARCH_ARMv5T 5 -#define CPU_ARCH_ARMv5TE 6 -#define CPU_ARCH_ARMv5TEJ 7 -#define CPU_ARCH_ARMv6 8 -#define CPU_ARCH_ARMv7 9 - /* * CR1 bits (CP#15 CR1) */ @@ -111,13 +100,9 @@ void mmu_setup(unsigned long start, unsigned long size); void arm_init_before_mmu(void); /* - * FIXME: sdelay, sr32, and wait_on_value originally came from - * arch/arm/cpu/armv7/exynos5/setup.h in u-boot but do not seem - * specific to exynos5... + * FIXME: sdelay originally came from arch/arm/cpu/armv7/exynos5/setup.h in + * u-boot but does not seem specific to exynos5... */ void sdelay(unsigned long loops); -void sr32(void *addr, u32 start_bit, u32 num_bits, u32 value); -u32 wait_on_value(u32 read_bit_mask, u32 match_value, void *read_addr, - u32 bound); #endif // __ASSEMBLY__ #endif /* SYSTEM_H_ */ diff --git a/src/arch/armv7/lib/syslib.c b/src/arch/armv7/lib/syslib.c index 6f38bf9..a6ed080 100644 --- a/src/arch/armv7/lib/syslib.c +++ b/src/arch/armv7/lib/syslib.c @@ -21,7 +21,6 @@ * MA 02111-1307 USA */ -//#include <common.h> #include <arch/io.h> #include <system.h> /* FIXME: dumping ground for prototypes */ @@ -38,33 +37,3 @@ void sdelay(unsigned long loops) "bne 1b":"=r" (loops):"0"(loops)); } -/***************************************************************** - * sr32 - clear & set a value in a bit range for a 32 bit address - *****************************************************************/ -void sr32(void *addr, u32 start_bit, u32 num_bits, u32 value) -{ - u32 tmp, msk = 0; - msk = 1 << num_bits; - --msk; - tmp = readl((u32)addr) & ~(msk << start_bit); - tmp |= value << start_bit; - writel(tmp, (u32)addr); -} - -/********************************************************************* - * wait_on_value() - common routine to allow waiting for changes in - * volatile regs. - *********************************************************************/ -u32 wait_on_value(u32 read_bit_mask, u32 match_value, void *read_addr, - u32 bound) -{ - u32 i = 0, val; - do { - ++i; - val = readl((u32)read_addr) & read_bit_mask; - if (val == match_value) - return 1; - if (i == bound) - return 0; - } while (1); -}

1 0

New patch to review for coreboot: c303881 ARMv7: Fix include file names in memset & memcpy
by Stefan Reinauer 15 Feb '13

15 Feb '13

Stefan Reinauer (stefan.reinauer(a)coreboot.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/2403 -gerrit commit c3038819f49e0dd4421b9c40c59a09a0a55972ee Author: Stefan Reinauer <reinauer(a)chromium.org> Date: Thu Feb 14 15:55:07 2013 -0800 ARMv7: Fix include file names in memset & memcpy We don't have asm/ Change-Id: I7f80f47e9d7f457b7a5a64603c59b14d3b536a8c Signed-off-by: Stefan Reinauer <reinauer(a)google.com> --- src/arch/armv7/lib/memcpy.S | 2 +- src/arch/armv7/lib/memset.S | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/arch/armv7/lib/memcpy.S b/src/arch/armv7/lib/memcpy.S index f655256..f04113f 100644 --- a/src/arch/armv7/lib/memcpy.S +++ b/src/arch/armv7/lib/memcpy.S @@ -10,7 +10,7 @@ * published by the Free Software Foundation. */ -#include <asm/assembler.h> +#include <assembler.h> #define W(instr) instr diff --git a/src/arch/armv7/lib/memset.S b/src/arch/armv7/lib/memset.S index 0cdf895..3ea2721 100644 --- a/src/arch/armv7/lib/memset.S +++ b/src/arch/armv7/lib/memset.S @@ -9,7 +9,7 @@ * * ASM optimised string functions */ -#include <asm/assembler.h> +#include <assembler.h> .text .align 5

1 0

New patch to review for coreboot: 4639cdc ARMv7: Simplify div64
by Stefan Reinauer 15 Feb '13

15 Feb '13

Stefan Reinauer (stefan.reinauer(a)coreboot.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/2402 -gerrit commit 4639cdc0bf938884334a9896dda716769b173ffe Author: Stefan Reinauer <reinauer(a)chromium.org> Date: Thu Feb 14 15:53:18 2013 -0800 ARMv7: Simplify div64 We don't need the overly complex optimized version, since we're only doing this in very few non-critical places. Also, add the div* files to the bootblock, they're needed if we do printk. Change-Id: I26f39f236aec4a8909680aa00f5ced29fc0db1bd Signed-off-by: Stefan Reinauer <reinauer(a)google.com> --- src/arch/armv7/include/div64.h | 186 +--------------------------------------- src/arch/armv7/lib/Makefile.inc | 2 + src/arch/armv7/lib/div64.S | 9 +- 3 files changed, 7 insertions(+), 190 deletions(-) diff --git a/src/arch/armv7/include/div64.h b/src/arch/armv7/include/div64.h index 5baed2b..9c3c29a 100644 --- a/src/arch/armv7/include/div64.h +++ b/src/arch/armv7/include/div64.h @@ -3,12 +3,7 @@ #ifndef __ASM_ARM_DIV64 #define __ASM_ARM_DIV64 -//#include <asm/system.h> -//#include <linux/types.h> -// FIXME - #define __asmeq(x, y) ".ifnc " x "," y " ; .err ; .endif\n\t" -#define __LINUX_ARM_ARCH__ 7 /* * The semantics of do_div() are: @@ -34,7 +29,7 @@ #define __xh "r1" #endif -#define __do_div_asm(n, base) \ +#define do_div(n, base) \ ({ \ register unsigned int __base asm("r4") = base; \ register unsigned long long __n asm("r0") = n; \ @@ -51,183 +46,4 @@ n = __res; \ __rem; \ }) - -#if __GNUC__ < 4 - -/* - * gcc versions earlier than 4.0 are simply too problematic for the - * optimized implementation below. First there is gcc PR 15089 that - * tend to trig on more complex constructs, spurious .global __udivsi3 - * are inserted even if none of those symbols are referenced in the - * generated code, and those gcc versions are not able to do constant - * propagation on long long values anyway. - */ -#define do_div(n, base) __do_div_asm(n, base) - -#elif __GNUC__ >= 4 - -//#include <asm/bug.h> - -/* - * If the divisor happens to be constant, we determine the appropriate - * inverse at compile time to turn the division into a few inline - * multiplications instead which is much faster. And yet only if compiling - * for ARMv4 or higher (we need umull/umlal) and if the gcc version is - * sufficiently recent to perform proper long long constant propagation. - * (It is unfortunate that gcc doesn't perform all this internally.) - */ -#define do_div(n, base) \ -({ \ - unsigned int __r, __b = (base); \ - if (!__builtin_constant_p(__b) || __b == 0 || \ - (__LINUX_ARM_ARCH__ < 4 && (__b & (__b - 1)) != 0)) { \ - /* non-constant divisor (or zero): slow path */ \ - __r = __do_div_asm(n, __b); \ - } else if ((__b & (__b - 1)) == 0) { \ - /* Trivial: __b is constant and a power of 2 */ \ - /* gcc does the right thing with this code. */ \ - __r = n; \ - __r &= (__b - 1); \ - n /= __b; \ - } else { \ - /* Multiply by inverse of __b: n/b = n*(p/b)/p */ \ - /* We rely on the fact that most of this code gets */ \ - /* optimized away at compile time due to constant */ \ - /* propagation and only a couple inline assembly */ \ - /* instructions should remain. Better avoid any */ \ - /* code construct that might prevent that. */ \ - unsigned long long __res, __x, __t, __m, __n = n; \ - unsigned int __c, __p, __z = 0; \ - /* preserve low part of n for reminder computation */ \ - __r = __n; \ - /* determine number of bits to represent __b */ \ - __p = 1 << __div64_fls(__b); \ - /* compute __m = ((__p << 64) + __b - 1) / __b */ \ - __m = (~0ULL / __b) * __p; \ - __m += (((~0ULL % __b + 1) * __p) + __b - 1) / __b; \ - /* compute __res = __m*(~0ULL/__b*__b-1)/(__p << 64) */ \ - __x = ~0ULL / __b * __b - 1; \ - __res = (__m & 0xffffffff) * (__x & 0xffffffff); \ - __res >>= 32; \ - __res += (__m & 0xffffffff) * (__x >> 32); \ - __t = __res; \ - __res += (__x & 0xffffffff) * (__m >> 32); \ - __t = (__res < __t) ? (1ULL << 32) : 0; \ - __res = (__res >> 32) + __t; \ - __res += (__m >> 32) * (__x >> 32); \ - __res /= __p; \ - /* Now sanitize and optimize what we've got. */ \ - if (~0ULL % (__b / (__b & -__b)) == 0) { \ - /* those cases can be simplified with: */ \ - __n /= (__b & -__b); \ - __m = ~0ULL / (__b / (__b & -__b)); \ - __p = 1; \ - __c = 1; \ - } else if (__res != __x / __b) { \ - /* We can't get away without a correction */ \ - /* to compensate for bit truncation errors. */ \ - /* To avoid it we'd need an additional bit */ \ - /* to represent __m which would overflow it. */ \ - /* Instead we do m=p/b and n/b=(n*m+m)/p. */ \ - __c = 1; \ - /* Compute __m = (__p << 64) / __b */ \ - __m = (~0ULL / __b) * __p; \ - __m += ((~0ULL % __b + 1) * __p) / __b; \ - } else { \ - /* Reduce __m/__p, and try to clear bit 31 */ \ - /* of __m when possible otherwise that'll */ \ - /* need extra overflow handling later. */ \ - unsigned int __bits = -(__m & -__m); \ - __bits |= __m >> 32; \ - __bits = (~__bits) << 1; \ - /* If __bits == 0 then setting bit 31 is */ \ - /* unavoidable. Simply apply the maximum */ \ - /* possible reduction in that case. */ \ - /* Otherwise the MSB of __bits indicates the */ \ - /* best reduction we should apply. */ \ - if (!__bits) { \ - __p /= (__m & -__m); \ - __m /= (__m & -__m); \ - } else { \ - __p >>= __div64_fls(__bits); \ - __m >>= __div64_fls(__bits); \ - } \ - /* No correction needed. */ \ - __c = 0; \ - } \ - /* Now we have a combination of 2 conditions: */ \ - /* 1) whether or not we need a correction (__c), and */ \ - /* 2) whether or not there might be an overflow in */ \ - /* the cross product (__m & ((1<<63) | (1<<31))) */ \ - /* Select the best insn combination to perform the */ \ - /* actual __m * __n / (__p << 64) operation. */ \ - if (!__c) { \ - asm ( "umull %Q0, %R0, %1, %Q2\n\t" \ - "mov %Q0, #0" \ - : "=&r" (__res) \ - : "r" (__m), "r" (__n) \ - : "cc" ); \ - } else if (!(__m & ((1ULL << 63) | (1ULL << 31)))) { \ - __res = __m; \ - asm ( "umlal %Q0, %R0, %Q1, %Q2\n\t" \ - "mov %Q0, #0" \ - : "+&r" (__res) \ - : "r" (__m), "r" (__n) \ - : "cc" ); \ - } else { \ - asm ( "umull %Q0, %R0, %Q1, %Q2\n\t" \ - "cmn %Q0, %Q1\n\t" \ - "adcs %R0, %R0, %R1\n\t" \ - "adc %Q0, %3, #0" \ - : "=&r" (__res) \ - : "r" (__m), "r" (__n), "r" (__z) \ - : "cc" ); \ - } \ - if (!(__m & ((1ULL << 63) | (1ULL << 31)))) { \ - asm ( "umlal %R0, %Q0, %R1, %Q2\n\t" \ - "umlal %R0, %Q0, %Q1, %R2\n\t" \ - "mov %R0, #0\n\t" \ - "umlal %Q0, %R0, %R1, %R2" \ - : "+&r" (__res) \ - : "r" (__m), "r" (__n) \ - : "cc" ); \ - } else { \ - asm ( "umlal %R0, %Q0, %R2, %Q3\n\t" \ - "umlal %R0, %1, %Q2, %R3\n\t" \ - "mov %R0, #0\n\t" \ - "adds %Q0, %1, %Q0\n\t" \ - "adc %R0, %R0, #0\n\t" \ - "umlal %Q0, %R0, %R2, %R3" \ - : "+&r" (__res), "+&r" (__z) \ - : "r" (__m), "r" (__n) \ - : "cc" ); \ - } \ - __res /= __p; \ - /* The reminder can be computed with 32-bit regs */ \ - /* only, and gcc is good at that. */ \ - { \ - unsigned int __res0 = __res; \ - unsigned int __b0 = __b; \ - __r -= __res0 * __b0; \ - } \ - /* BUG_ON(__r >= __b || __res * __b + __r != n); */ \ - n = __res; \ - } \ - __r; \ -}) - -/* our own fls implementation to make sure constant propagation is fine */ -#define __div64_fls(bits) \ -({ \ - unsigned int __left = (bits), __nr = 0; \ - if (__left & 0xffff0000) __nr += 16, __left >>= 16; \ - if (__left & 0x0000ff00) __nr += 8, __left >>= 8; \ - if (__left & 0x000000f0) __nr += 4, __left >>= 4; \ - if (__left & 0x0000000c) __nr += 2, __left >>= 2; \ - if (__left & 0x00000002) __nr += 1; \ - __nr; \ -}) - -#endif - #endif diff --git a/src/arch/armv7/lib/Makefile.inc b/src/arch/armv7/lib/Makefile.inc index 048e071..603f42b 100644 --- a/src/arch/armv7/lib/Makefile.inc +++ b/src/arch/armv7/lib/Makefile.inc @@ -1,5 +1,7 @@ bootblock-y += syslib.c bootblock-$(CONFIG_EARLY_CONSOLE) += early_console.c +bootblock-y += div0.c +bootblock-y += div64.S romstage-y += cache_v7.c romstage-y += cache-cp15.c diff --git a/src/arch/armv7/lib/div64.S b/src/arch/armv7/lib/div64.S index 44edf48..41a0949 100644 --- a/src/arch/armv7/lib/div64.S +++ b/src/arch/armv7/lib/div64.S @@ -13,8 +13,7 @@ */ // FIXME -//#include <linux/linkage.h> -#define __LINUX_ARM_ARCH__ 7 +#define __ARM_ARCH__ 7 #ifdef __ARMEB__ #define xh r0 @@ -65,7 +64,7 @@ __do_div64: @ The aligned divisor is stored in yl preserving the original. @ The bit position is stored in ip. -#if __LINUX_ARM_ARCH__ >= 5 +#if __ARM_ARCH__ >= 5 clz yl, r4 clz ip, xh @@ -125,7 +124,7 @@ __do_div64: @ We still have remainer bits in the low part. Bring them up. -#if __LINUX_ARM_ARCH__ >= 5 +#if __ARM_ARCH__ >= 5 clz xh, xl @ we know xh is zero here so... add xh, xh, #1 @@ -152,7 +151,7 @@ __do_div64: 8: @ Division by a power of 2: determine what that divisor order is @ then simply shift values around -#if __LINUX_ARM_ARCH__ >= 5 +#if __ARM_ARCH__ >= 5 clz ip, r4 rsb ip, ip, #31

1 0

New patch to review for coreboot: 570c4e3 ARMv7: Drop more unused files
by Stefan Reinauer 15 Feb '13

15 Feb '13

Stefan Reinauer (stefan.reinauer(a)coreboot.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/2401 -gerrit commit 570c4e358a8e6298d80367323b2fdd376a498a74 Author: Stefan Reinauer <reinauer(a)chromium.org> Date: Thu Feb 14 15:51:31 2013 -0800 ARMv7: Drop more unused files Change-Id: I0dd83f96d2a9598e9677d1b0b114229de6724287 Signed-off-by: Stefan Reinauer <reinauer(a)google.com> --- src/arch/armv7/cpu.c | 101 ------------------------------------- src/arch/armv7/include/mmio_conf.h | 6 --- 2 files changed, 107 deletions(-) diff --git a/src/arch/armv7/cpu.c b/src/arch/armv7/cpu.c deleted file mode 100644 index 622e7ed..0000000 --- a/src/arch/armv7/cpu.c +++ /dev/null @@ -1,101 +0,0 @@ -/* - * (C) Copyright 2008 Texas Insturments - * - * (C) Copyright 2002 - * Sysgo Real-Time Solutions, GmbH <www.elinos.com> - * Marius Groeger <mgroeger(a)sysgo.de> - * - * (C) Copyright 2002 - * Gary Jennejohn, DENX Software Engineering, <garyj(a)denx.de> - * - * See file CREDITS for list of people who contributed to this - * project. - * - * 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., 59 Temple Place, Suite 330, Boston, - * MA 02111-1307 USA - */ - -/* - * CPU specific code - */ - -#if 0 -#include <common.h> -#include <command.h> -#include <asm/system.h> -#include <asm/cache.h> -#include <asm/armv7.h> -#ifdef CONFIG_EXYNOS_LCD -#include <exynos-fb.h> -#endif -#endif - -void save_boot_params_default(u32 r0, u32 r1, u32 r2, u32 r3) -{ -} - -void save_boot_params(u32 r0, u32 r1, u32 r2, u32 r3) - __attribute__((weak, alias("save_boot_params_default"))); - -#if 0 -int cleanup_before_linux(void) -{ -#ifdef CONFIG_BOOTSTAGE_REPORT - bootstage_report(); -#endif -#ifdef CONFIG_BOOTSTAGE_STASH - bootstage_stash((void *)CONFIG_BOOTSTAGE_STASH, - CONFIG_BOOTSTAGE_STASH_SIZE); -#endif - /* - * this function is called just before we call linux - * it prepares the processor for linux - * - * we turn off caches etc ... - */ - disable_interrupts(); - -#ifdef CONFIG_EXYNOS_LCD - exynos_fimd_disable(); -#endif - - /* - * Turn off I-cache and invalidate it - */ - icache_disable(); - invalidate_icache_all(); - - /* - * turn off D-cache - * dcache_disable() in turn flushes the d-cache and disables MMU - */ - dcache_disable(); - v7_outer_cache_disable(); - - /* - * After D-cache is flushed and before it is disabled there may - * be some new valid entries brought into the cache. We are sure - * that these lines are not dirty and will not affect our execution. - * (because unwinding the call-stack and setting a bit in CP15 SCTRL - * is all we did during this. We have not pushed anything on to the - * stack. Neither have we affected any static data) - * So just invalidate the entire d-cache again to avoid coherency - * problems for kernel - */ - invalidate_dcache_all(); - - return 0; -} -#endif diff --git a/src/arch/armv7/include/mmio_conf.h b/src/arch/armv7/include/mmio_conf.h deleted file mode 100644 index 143c6bd..0000000 --- a/src/arch/armv7/include/mmio_conf.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef ARCH_MMIO_H -#define ARCH_MMIO_H 1 - -// Nut'n'Bitch - -#endif /* ARCH_MMIO_H */

1 0

New patch to review for coreboot: b651534 Drop include/arch-generic/div64.h
by Stefan Reinauer 15 Feb '13

15 Feb '13

Stefan Reinauer (stefan.reinauer(a)coreboot.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/2400 -gerrit commit b6515342c69cbfffbaaaa94473fbea1e0cb0799c Author: Stefan Reinauer <reinauer(a)chromium.org> Date: Thu Feb 14 15:50:53 2013 -0800 Drop include/arch-generic/div64.h It's unused. Change-Id: Id67ca754ff7ad148ff1ecd4f1e5c986a4e7585a8 Signed-off-by: Stefan Reinauer <reinauer(a)google.com> --- src/include/arch-generic/div64.h | 61 ---------------------------------------- 1 file changed, 61 deletions(-) diff --git a/src/include/arch-generic/div64.h b/src/include/arch-generic/div64.h deleted file mode 100644 index 08db225..0000000 --- a/src/include/arch-generic/div64.h +++ /dev/null @@ -1,61 +0,0 @@ -#ifndef ARCH_GENERIC_DIV64_H -#define ARCH_GENERIC_DIV64_H -/* - * Copyright (C) 2003 Bernardo Innocenti <bernie(a)develer.com> - * Based on former asm-ppc/div64.h and asm-m68knommu/div64.h - * - * The semantics of do_div() are: - * - * uint32_t do_div(uint64_t *n, uint32_t base) - * { - * uint32_t remainder = *n % base; - * *n = *n / base; - * return remainder; - * } - * - * NOTE: macro parameter n is evaluated multiple times, - * beware of side effects! - */ - -#ifndef ULONG_MAX -#include <limits.h> -#endif -#include <stdint.h> - -#if ULONG_MAX == 4294967295 - -extern uint32_t __div64_32(uint64_t *dividend, uint32_t divisor); - -/* The unnecessary pointer compare is there - * to check for type safety (n must be 64bit) - */ -# define do_div(n,base) ({ \ - uint32_t __base = (base); \ - uint32_t __rem; \ - (void)(((typeof((n)) *)0) == ((uint64_t *)0)); \ - if (((n) >> 32) == 0) { \ - __rem = (uint32_t)(n) % __base; \ - (n) = (uint32_t)(n) / __base; \ - } else \ - __rem = __div64_32(&(n), __base); \ - __rem; \ - }) - -#elif ULONG_MAX == 18446744073709551615 - -# define do_div(n,base) ({ \ - uint32_t __base = (base); \ - uint32_t __rem; \ - __rem = ((uint64_t)(n)) % __base; \ - (n) = ((uint64_t)(n)) / __base; \ - __rem; \ - }) - - -#else /* BITS_PER_LONG == ?? */ - -# error do_div() does not yet support the C64 - -#endif /* BITS_PER_LONG */ - -#endif /* ARCH_GENERIC_DIV64_H */

1 0

New patch to review for coreboot: 219d49b libpayload: fix compiler flags
by Ronald G. Minnich 15 Feb '13

15 Feb '13

Ronald G. Minnich (rminnich(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/2399 -gerrit commit 219d49ba4a9999dfa1e2cdb73c730c1122102c0f Author: Ronald G. Minnich <rminnich(a)gmail.com> Date: Thu Feb 14 15:26:09 2013 -0800 libpayload: fix compiler flags lpgcc was unconditionally setting -m32. Most of the flags it sets in the common case are right, however: no need to duplicate them everywhere, and we only want to change the common ones in one place, so it would be a shame to duplicate _CFLAGS all over the place. So add another variable, _ARCHEXTRA, which can be used to add special flags to _CFLAGS. We onlu use it at present for the x86; this may change. This allows us to get through compiling on arm and x86. Change-Id: I12f1620982c4ee10f76b3953e4225f13db31531e Signed-off-by: Ronald G. Minnich <rminnich(a)gmail.com> --- payloads/libpayload/bin/lpgcc | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/payloads/libpayload/bin/lpgcc b/payloads/libpayload/bin/lpgcc index 52a8e55..06b9021 100755 --- a/payloads/libpayload/bin/lpgcc +++ b/payloads/libpayload/bin/lpgcc @@ -110,26 +110,29 @@ done if [ "$CONFIG_ARCH_ARMV7" = "y" ]; then _ARCHINCDIR=$_INCDIR/armv7 _ARCHLIBDIR=$_LIBDIR/armv7 + _ARCHEXTRA="" fi if [ "$CONFIG_ARCH_POWERPC" = "y" ]; then _ARCHINCDIR=$_INCDIR/powerpc _ARCHLIBDIR=$_LIBDIR/powerpc + _ARCHEXTRA="" fi if [ "$CONFIG_ARCH_X86" = "y" ]; then _ARCHINCDIR=$_INCDIR/x86 _ARCHLIBDIR=$_LIBDIR/x86 + _ARCHEXTRA="-m32 " fi -_CFLAGS="-m32 -nostdinc -nostdlib -I$_INCDIR -I$_ARCHINCDIR -D__LIBPAYLOAD__=1" +_CFLAGS="$_ARCHEXTRA -nostdinc -nostdlib -I$_INCDIR -I$_ARCHINCDIR -D__LIBPAYLOAD__=1" # Check for the -fno-stack-protector silliness trygccoption -fno-stack-protector [ $? -eq 0 ] && _CFLAGS="$_CFLAGS -fno-stack-protector" -_CFLAGS="$_CFLAGS -I`$DEFAULT_CC -m32 -print-search-dirs | head -n 1 | cut -d' ' -f2`include" +_CFLAGS="$_CFLAGS -I`$DEFAULT_CC $_ARCHEXTRA -print-search-dirs | head -n 1 | cut -d' ' -f2`include" _LDFLAGS="-L$BASE/../lib $_LDSCRIPT -static" @@ -140,7 +143,7 @@ if [ $DOLINK -eq 0 ]; then $DEFAULT_CC $_CFLAGS $CMDLINE else - _LIBGCC=`$DEFAULT_CC -m32 -print-libgcc-file-name` + _LIBGCC=`$DEFAULT_CC $_ARCHEXTRA -print-libgcc-file-name` if [ $DEBUGME -eq 1 ]; then echo "$DEFAULT_CC $_CFLAGS $_LDFLAGS $_ARCHLIBDIR/head.o $CMDLINE -lpayload $_LIBGCC" fi

1 0

← Newer
1
...
31
32
33
34
35
36
37
...
79
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

coreboot February 2013