Ronald G. Minnich (rminnich(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/2398
-gerrit
commit e0282b53e35fc0e3a82292024387a149730713f0
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>
---
payloads/libpayload/arch/armv7/libpayload.ldscript | 93 ++++++++++++++++++++++
1 file changed, 93 insertions(+)
diff --git a/payloads/libpayload/arch/armv7/libpayload.ldscript b/payloads/libpayload/arch/armv7/libpayload.ldscript
new file mode 100644
index 0000000..5f65bd7
--- /dev/null
+++ b/payloads/libpayload/arch/armv7/libpayload.ldscript
@@ -0,0 +1,93 @@
+/*
+ * This file is part of the libpayload project.
+ *
+ * Copyright (C) 2013 Google, Inc.
+ * Copyright (C) 2008 Advanced Micro Devices, Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+BASE_ADDRESS = 0x4000000;
+
+OUTPUT_FORMAT("elf32-littlearm","elf32-littlearm", "elf32-littlearm")
+OUTPUT_ARCH(arm)
+
+ENTRY(_entry)
+
+HEAP_SIZE = 2*64*1024;
+STACK_SIZE = 16384;
+
+SECTIONS
+{
+ . = BASE_ADDRESS;
+
+ . = ALIGN(16);
+ _start = .;
+
+ .text : {
+ *(.text._entry)
+ *(.text)
+ *(.text.*)
+ }
+
+ .rodata : {
+ *(.rodata)
+ *(.rodata.*)
+ }
+
+ .data : {
+ *(.data)
+ *(.data.*)
+ }
+
+ _edata = .;
+
+ .bss : {
+ *(.sbss)
+ *(.sbss.*)
+ *(.bss)
+ *(.bss.*)
+ *(COMMON)
+
+ /* Stack and heap */
+
+ . = ALIGN(16);
+ _heap = .;
+ . += HEAP_SIZE;
+ . = ALIGN(16);
+ _eheap = .;
+
+ _estack = .;
+ . += STACK_SIZE;
+ . = ALIGN(16);
+ _stack = .;
+ }
+
+ _end = .;
+
+ /DISCARD/ : {
+ *(.comment)
+ *(.note*)
+ }
+}
the following patch was just integrated into master:
commit 8e7b3c458c176bcb9b72de94fe4c8794566b4555
Author: Stefan Reinauer <reinauer(a)chromium.org>
Date: Thu Feb 14 14:43:42 2013 -0800
Exynos: Drop unused include files
Change-Id: Ib533938446a289167725f5beda77c2ee5236e8a5
Signed-off-by: Stefan Reinauer <reinauer(a)google.com>
Reviewed-on: http://review.coreboot.org/2395
Reviewed-by: David Hendricks <dhendrix(a)chromium.org>
Tested-by: build bot (Jenkins)
Build-Tested: build bot (Jenkins) at Fri Feb 15 00:13:07 2013, giving +1
Reviewed-By: David Hendricks <dhendrix(a)chromium.org> at Fri Feb 15 00:10:01 2013, giving +2
See http://review.coreboot.org/2395 for details.
-gerrit
Ronald G. Minnich (rminnich(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/2397
-gerrit
commit d24135e690244b938e08b9ecf7b4e8f1916a0b2b
Author: Ronald G. Minnich <rminnich(a)gmail.com>
Date: Thu Feb 14 15:09:21 2013 -0800
libpayload: get time to compile cross-arch
Get rid of the nest of includes, and make separate sections
for each architecture. Also gets rid of the "there's X86 and there's
everything else" structure of this file.
Change-Id: I4232f50f048fa05e911e5de3aa9ec1530931b461
Signed-off-by: Ronald G. Minnich <rminnich(a)gmail.com>
---
payloads/libpayload/libc/time.c | 19 +++++++++++++------
1 file changed, 13 insertions(+), 6 deletions(-)
diff --git a/payloads/libpayload/libc/time.c b/payloads/libpayload/libc/time.c
index 5358c02..91f6296 100644
--- a/payloads/libpayload/libc/time.c
+++ b/payloads/libpayload/libc/time.c
@@ -110,14 +110,20 @@ static void gettimeofday_init(void)
clock.secs = (days * 86400) + (tm.tm_hour * 3600) +
(tm.tm_min * 60) + tm.tm_sec;
}
-#else
+#endif // CONFIG_NVRAM
+#endif // CONFIG_ARCH_X86
+
+#ifdef CONFIG_ARCH_ARMV7
+static void update_clock(void)
+{
+}
+
static void gettimeofday_init(void)
{
- /* Record the number of ticks */
- clock.ticks = rdtsc();
}
-#endif
-#endif
+#endif // CONFIG_ARCH_ARMV7
+
+
#ifdef CONFIG_ARCH_POWERPC
static void update_clock(void)
{
@@ -126,7 +132,8 @@ static void update_clock(void)
static void gettimeofday_init(void)
{
}
-#endif
+#endif // CONFIG_ARCH_POWERPC
+
/**
* Return the current time broken into a timeval structure.
*
Ronald G. Minnich (rminnich(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/2396
-gerrit
commit aa665fe0e830bf8737ab3dd9c255fd309dbcc482
Author: Ronald G. Minnich <rminnich(a)gmail.com>
Date: Thu Feb 14 14:50:10 2013 -0800
libpayload: only compile drivers/serial.c on machines that it works on
Create a new serial control variable, X86_SERIAL_CONSOLE (I think
a better name is likely needed) which is only enabled when both
SERIAL_CONSOLE and ARCH_X86 are defined.
Builds for arm and x86 now. Not tested for Power PC; I think we
need to decide what to do about that platform (later).
Change-Id: If9cf7caecf0b9541ada906899058f4a3bb5c7737
Signed-off-by: Ronald G. Minnich <rminnich(a)gmail.com>
---
payloads/libpayload/Config.in | 7 ++++++-
payloads/libpayload/drivers/Makefile.inc | 2 +-
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/payloads/libpayload/Config.in b/payloads/libpayload/Config.in
index a14291d..7efbc2b 100644
--- a/payloads/libpayload/Config.in
+++ b/payloads/libpayload/Config.in
@@ -168,9 +168,14 @@ config SERIAL_CONSOLE
bool "See output on the serial port console"
default y
+config X86_SERIAL_CONSOLE
+ bool
+ depends on ARCH_X86 && SERIAL_CONSOLE
+ default y
+
config SERIAL_IOBASE
hex "I/O base for the serial port (default 0x3f8)"
- depends on SERIAL_CONSOLE
+ depends on ARCH_X86 && SERIAL_CONSOLE
default 0x3f8
config SERIAL_SET_SPEED
diff --git a/payloads/libpayload/drivers/Makefile.inc b/payloads/libpayload/drivers/Makefile.inc
index e3bb995..60e0fab 100644
--- a/payloads/libpayload/drivers/Makefile.inc
+++ b/payloads/libpayload/drivers/Makefile.inc
@@ -33,7 +33,7 @@ libc-$(CONFIG_PCI) += pci.c
libc-$(CONFIG_SPEAKER) += speaker.c
-libc-$(CONFIG_SERIAL_CONSOLE) += serial.c
+libc-$(CONFIG_X86_SERIAL_CONSOLE) += serial.c
libc-$(CONFIG_PC_KEYBOARD) += keyboard.c
the following patch was just integrated into master:
commit a957b7ad21a72c4be3bb09efe6370ec3515c7074
Author: Stefan Reinauer <reinauer(a)chromium.org>
Date: Thu Feb 14 13:39:25 2013 -0800
ARMv7: drop multiboot support
Multiboot is an x86 only thing. Drop support on ARM.
Change-Id: I13fafa464a794206d5450b4a1f23a187967a8338
Signed-off-by: Stefan Reinauer <reinauer(a)google.com>
Reviewed-on: http://review.coreboot.org/2392
Tested-by: build bot (Jenkins)
Reviewed-by: Ronald G. Minnich <rminnich(a)gmail.com>
Build-Tested: build bot (Jenkins) at Thu Feb 14 23:30:52 2013, giving +1
Reviewed-By: Ronald G. Minnich <rminnich(a)gmail.com> at Thu Feb 14 23:55:33 2013, giving +2
See http://review.coreboot.org/2392 for details.
-gerrit
the following patch was just integrated into master:
commit 0928eb342976e2bc759207ad4ec0ea28b3b71cd2
Author: Stefan Reinauer <reinauer(a)chromium.org>
Date: Thu Feb 14 13:38:38 2013 -0800
Exynos: Drop duplicate copy of watchdog.h
Change-Id: I4c9bfa9eb7708420dc42c16bc152d761d2bdfee3
Signed-off-by: Stefan Reinauer <reinauer(a)google.com>
Reviewed-on: http://review.coreboot.org/2391
Tested-by: build bot (Jenkins)
Reviewed-by: Ronald G. Minnich <rminnich(a)gmail.com>
Build-Tested: build bot (Jenkins) at Thu Feb 14 23:23:01 2013, giving +1
Reviewed-By: Ronald G. Minnich <rminnich(a)gmail.com> at Thu Feb 14 23:54:33 2013, giving +2
See http://review.coreboot.org/2391 for details.
-gerrit
Ronald G. Minnich (rminnich(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/2395
-gerrit
commit 5c502d198875fa24ccc927bc1368d50dd7c51f0e
Author: Stefan Reinauer <reinauer(a)chromium.org>
Date: Thu Feb 14 14:43:42 2013 -0800
Exynos: Drop unused include files
Change-Id: Ib533938446a289167725f5beda77c2ee5236e8a5
Signed-off-by: Stefan Reinauer <reinauer(a)google.com>
---
src/cpu/samsung/exynos5-common/mmc.h | 77 ---------------
src/cpu/samsung/exynos5-common/mshc.h | 170 ---------------------------------
src/cpu/samsung/exynos5250/adc.h | 27 ------
src/cpu/samsung/exynos5250/mmc.h | 27 ------
src/cpu/samsung/exynos5250/mshc.h | 31 ------
src/cpu/samsung/exynos5250/pwm.h | 27 ------
src/cpu/samsung/s5p-common/mmc.h | 73 --------------
src/cpu/samsung/s5p-common/sys_proto.h | 29 ------
8 files changed, 461 deletions(-)
diff --git a/src/cpu/samsung/exynos5-common/mmc.h b/src/cpu/samsung/exynos5-common/mmc.h
deleted file mode 100644
index f607f82..0000000
--- a/src/cpu/samsung/exynos5-common/mmc.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * (C) Copyright 2009 SAMSUNG Electronics
- * Minkyu Kang <mk7.kang(a)samsung.com>
- *
- * 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
- *
- */
-
-#ifndef __ASM_ARCH_COMMON_MMC_H_
-#define __ASM_ARCH_COMMON_MMC_H_
-
-#ifndef __ASSEMBLER__
-struct s5p_mmc {
- unsigned int sysad;
- unsigned short blksize;
- unsigned short blkcnt;
- unsigned int argument;
- unsigned short trnmod;
- unsigned short cmdreg;
- unsigned int rspreg0;
- unsigned int rspreg1;
- unsigned int rspreg2;
- unsigned int rspreg3;
- unsigned int bdata;
- unsigned int prnsts;
- unsigned char hostctl;
- unsigned char pwrcon;
- unsigned char blkgap;
- unsigned char wakcon;
- unsigned short clkcon;
- unsigned char timeoutcon;
- unsigned char swrst;
- unsigned int norintsts; /* errintsts */
- unsigned int norintstsen; /* errintstsen */
- unsigned int norintsigen; /* errintsigen */
- unsigned short acmd12errsts;
- unsigned char res1[2];
- unsigned int capareg;
- unsigned char res2[4];
- unsigned int maxcurr;
- unsigned char res3[0x34];
- unsigned int control2;
- unsigned int control3;
- unsigned char res4[4];
- unsigned int control4;
- unsigned char res5[0x6e];
- unsigned short hcver;
- unsigned char res6[0xFF00];
-};
-
-struct mmc_host {
- struct s5p_mmc *reg;
- unsigned int version; /* SDHCI spec. version */
- unsigned int clock; /* Current clock (MHz) */
- int dev_index;
-};
-
-#ifdef CONFIG_OF_CONTROL
-int s5p_mmc_init(const void *blob);
-#else
-int s5p_mmc_init(int dev_index, int bus_width);
-#endif
-
-#endif /* __ASSEMBLER__ */
-#endif
diff --git a/src/cpu/samsung/exynos5-common/mshc.h b/src/cpu/samsung/exynos5-common/mshc.h
deleted file mode 100644
index 623492c..0000000
--- a/src/cpu/samsung/exynos5-common/mshc.h
+++ /dev/null
@@ -1,170 +0,0 @@
-/*
- * (C) Copyright 2012 SAMSUNG Electronics
- * Abhilash Kesavan <a.kesavan(a)samsung.com>
- *
- * 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
- *
- */
-#ifndef __ASM_ARCH_COMMON_MSHC_H
-#define __ASM_ARCH_COMMON_MSHC_H
-
-#include <asm/arch/pinmux.h>
-#ifndef __ASSEMBLER__
-struct mshci_host {
- struct s5p_mshci *reg; /* Mapped address */
- unsigned int clock; /* Current clock in MHz */
- enum periph_id peripheral;
-};
-
-struct s5p_mshci {
- unsigned int ctrl;
- unsigned int pwren;
- unsigned int clkdiv;
- unsigned int clksrc;
- unsigned int clkena;
- unsigned int tmout;
- unsigned int ctype;
- unsigned int blksiz;
- unsigned int bytcnt;
- unsigned int intmask;
- unsigned int cmdarg;
- unsigned int cmd;
- unsigned int resp0;
- unsigned int resp1;
- unsigned int resp2;
- unsigned int resp3;
- unsigned int mintsts;
- unsigned int rintsts;
- unsigned int status;
- unsigned int fifoth;
- unsigned int cdetect;
- unsigned int wrtprt;
- unsigned int gpio;
- unsigned int tcbcnt;
- unsigned int tbbcnt;
- unsigned int debnce;
- unsigned int usrid;
- unsigned int verid;
- unsigned int hcon;
- unsigned int uhs_reg;
- unsigned int rst_n;
- unsigned char reserved1[4];
- unsigned int bmod;
- unsigned int pldmnd;
- unsigned int dbaddr;
- unsigned int idsts;
- unsigned int idinten;
- unsigned int dscaddr;
- unsigned int bufaddr;
- unsigned int clksel;
- unsigned char reserved2[460];
- unsigned int cardthrctl;
-};
-
-/*
- * Struct idma
- * Holds the descriptor list
- */
-struct mshci_idmac {
- u32 des0;
- u32 des1;
- u32 des2;
- u32 des3;
-};
-
-/* Control Register Register */
-#define CTRL_RESET (0x1 << 0)
-#define FIFO_RESET (0x1 << 1)
-#define DMA_RESET (0x1 << 2)
-#define DMA_ENABLE (0x1 << 5)
-#define SEND_AS_CCSD (0x1 << 10)
-#define ENABLE_IDMAC (0x1 << 25)
-
-/* Power Enable Register */
-#define POWER_ENABLE (0x1 << 0)
-
-/* Clock Enable Register */
-#define CLK_ENABLE (0x1 << 0)
-#define CLK_DISABLE (0x0 << 0)
-
-/* Timeout Register */
-#define TMOUT_MAX 0xffffffff
-
-/* Card Type Register */
-#define PORT0_CARD_WIDTH1 0
-#define PORT0_CARD_WIDTH4 (0x1 << 0)
-#define PORT0_CARD_WIDTH8 (0x1 << 16)
-
-/* Interrupt Mask Register */
-#define INTMSK_ALL 0xffffffff
-#define INTMSK_RE (0x1 << 1)
-#define INTMSK_CDONE (0x1 << 2)
-#define INTMSK_DTO (0x1 << 3)
-#define INTMSK_DCRC (0x1 << 7)
-#define INTMSK_RTO (0x1 << 8)
-#define INTMSK_DRTO (0x1 << 9)
-#define INTMSK_HTO (0x1 << 10)
-#define INTMSK_FRUN (0x1 << 11)
-#define INTMSK_HLE (0x1 << 12)
-#define INTMSK_SBE (0x1 << 13)
-#define INTMSK_ACD (0x1 << 14)
-#define INTMSK_EBE (0x1 << 15)
-
-/* Command Register */
-#define CMD_RESP_EXP_BIT (0x1 << 6)
-#define CMD_RESP_LENGTH_BIT (0x1 << 7)
-#define CMD_CHECK_CRC_BIT (0x1 << 8)
-#define CMD_DATA_EXP_BIT (0x1 << 9)
-#define CMD_RW_BIT (0x1 << 10)
-#define CMD_SENT_AUTO_STOP_BIT (0x1 << 12)
-#define CMD_WAIT_PRV_DAT_BIT (0x1 << 13)
-#define CMD_SEND_CLK_ONLY (0x1 << 21)
-#define CMD_USE_HOLD_REG (0x1 << 29)
-#define CMD_STRT_BIT (0x1 << 31)
-#define CMD_ONLY_CLK (CMD_STRT_BIT | CMD_SEND_CLK_ONLY | \
- CMD_WAIT_PRV_DAT_BIT)
-
-/* Raw Interrupt Register */
-#define DATA_ERR (INTMSK_EBE | INTMSK_SBE | INTMSK_HLE | \
- INTMSK_FRUN | INTMSK_EBE | INTMSK_DCRC)
-#define DATA_TOUT (INTMSK_HTO | INTMSK_DRTO)
-
-/* Status Register */
-#define DATA_BUSY (0x1 << 9)
-
-/* FIFO Threshold Watermark Register */
-#define TX_WMARK (0xFFF << 0)
-#define RX_WMARK (0xFFF << 16)
-#define MSIZE_MASK (0x7 << 28)
-
-/* DW DMA Mutiple Transaction Size */
-#define MSIZE_8 (2 << 28)
-
-/* Bus Mode Register */
-#define BMOD_IDMAC_RESET (0x1 << 0)
-#define BMOD_IDMAC_FB (0x1 << 1)
-#define BMOD_IDMAC_ENABLE (0x1 << 7)
-
-/* IDMAC bits */
-#define MSHCI_IDMAC_OWN (0x1 << 31)
-#define MSHCI_IDMAC_CH (0x1 << 4)
-#define MSHCI_IDMAC_FS (0x1 << 3)
-#define MSHCI_IDMAC_LD (0x1 << 2)
-
-int s5p_mshci_init(const void *blob);
-
-#endif
-#endif
-
diff --git a/src/cpu/samsung/exynos5250/adc.h b/src/cpu/samsung/exynos5250/adc.h
deleted file mode 100644
index 86fcb88..0000000
--- a/src/cpu/samsung/exynos5250/adc.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * (C) Copyright 2012 Samsung Electronics
- * Minkyu Kang <mk7.kang(a)samsung.com>
- *
- * 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
- *
- */
-
-#ifndef __ASM_ARM_ARCH_EXYNOS5_ADC_H__
-#define __ASM_ARM_ARCH_EXYNOS5_ADC_H__
-
-#include <asm/arch-exynos/adc.h>
-
-#endif /* __ASM_ARM_ARCH_EXYNOS5_ADC_H__ */
diff --git a/src/cpu/samsung/exynos5250/mmc.h b/src/cpu/samsung/exynos5250/mmc.h
deleted file mode 100644
index 24acbc1..0000000
--- a/src/cpu/samsung/exynos5250/mmc.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * (C) Copyright 2012 Samsung Electronics
- * Minkyu Kang <mk7.kang(a)samsung.com>
- *
- * 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
- *
- */
-
-#ifndef __ASM_ARM_ARCH_EXYNOS5_MMC_H__
-#define __ASM_ARM_ARCH_EXYNOS5_MMC_H__
-
-#include <asm/arch-exynos/mmc.h>
-
-#endif /* __ASM_ARM_ARCH_EXYNOS5_MMC_H__ */
diff --git a/src/cpu/samsung/exynos5250/mshc.h b/src/cpu/samsung/exynos5250/mshc.h
deleted file mode 100644
index d8e3ad0..0000000
--- a/src/cpu/samsung/exynos5250/mshc.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * (C) Copyright 2012 Samsung Electronics
- *
- * 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
- *
- */
-
-#ifndef __ASM_ARM_ARCH_EXYNOS5_MSHC_H__
-#define __ASM_ARM_ARCH_EXYNOS5_MSHC_H__
-
-#include <asm/arch-exynos/mshc.h>
-
-#define MAX_MSHCI_CLOCK 52000000 /* Max limit for mshc clock is 52MHz */
-#define MIN_MSHCI_CLOCK 400000 /* Lower limit for mshc clock is 400KHz */
-#define COMMAND_TIMEOUT 10000
-#define TIMEOUT_MS 100
-
-#endif /* __ASM_ARM_ARCH_EXYNOS5_MSHC_H__ */
diff --git a/src/cpu/samsung/exynos5250/pwm.h b/src/cpu/samsung/exynos5250/pwm.h
deleted file mode 100644
index e7ae208..0000000
--- a/src/cpu/samsung/exynos5250/pwm.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * (C) Copyright 2012 Samsung Electronics
- * Minkyu Kang <mk7.kang(a)samsung.com>
- *
- * 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
- *
- */
-
-#ifndef __ASM_ARM_ARCH_EXYNOS5_PWM_H__
-#define __ASM_ARM_ARCH_EXYNOS5_PWM_H__
-
-#include <asm/arch-exynos/pwm.h>
-
-#endif /* __ASM_ARM_ARCH_EXYNOS5_PWM_H__ */
diff --git a/src/cpu/samsung/s5p-common/mmc.h b/src/cpu/samsung/s5p-common/mmc.h
deleted file mode 100644
index 675666c..0000000
--- a/src/cpu/samsung/s5p-common/mmc.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * (C) Copyright 2009 SAMSUNG Electronics
- * Minkyu Kang <mk7.kang(a)samsung.com>
- *
- * 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
- *
- */
-
-#ifndef __ASM_ARCH_MMC_H_
-#define __ASM_ARCH_MMC_H_
-
-#ifndef __ASSEMBLER__
-struct s5p_mmc {
- unsigned int sysad;
- unsigned short blksize;
- unsigned short blkcnt;
- unsigned int argument;
- unsigned short trnmod;
- unsigned short cmdreg;
- unsigned int rspreg0;
- unsigned int rspreg1;
- unsigned int rspreg2;
- unsigned int rspreg3;
- unsigned int bdata;
- unsigned int prnsts;
- unsigned char hostctl;
- unsigned char pwrcon;
- unsigned char blkgap;
- unsigned char wakcon;
- unsigned short clkcon;
- unsigned char timeoutcon;
- unsigned char swrst;
- unsigned int norintsts; /* errintsts */
- unsigned int norintstsen; /* errintstsen */
- unsigned int norintsigen; /* errintsigen */
- unsigned short acmd12errsts;
- unsigned char res1[2];
- unsigned int capareg;
- unsigned char res2[4];
- unsigned int maxcurr;
- unsigned char res3[0x34];
- unsigned int control2;
- unsigned int control3;
- unsigned char res4[4];
- unsigned int control4;
- unsigned char res5[0x6e];
- unsigned short hcver;
- unsigned char res6[0xFFF00];
-};
-
-struct mmc_host {
- struct s5p_mmc *reg;
- unsigned int version; /* SDHCI spec. version */
- unsigned int clock; /* Current clock (MHz) */
- int dev_index;
-};
-
-int s5p_mmc_init(int dev_index, int bus_width);
-
-#endif /* __ASSEMBLER__ */
-#endif
diff --git a/src/cpu/samsung/s5p-common/sys_proto.h b/src/cpu/samsung/s5p-common/sys_proto.h
deleted file mode 100644
index 7b83c5a..0000000
--- a/src/cpu/samsung/s5p-common/sys_proto.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (C) 2009 Samsung Electrnoics
- * Minkyu Kang <mk7.kang(a)samsung.com>
- *
- * 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
- */
-
-#ifndef _SYS_PROTO_H_
-#define _SYS_PROTO_H_
-
-u32 get_device_type(void);
-
-#endif
Ronald G. Minnich (rminnich(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/2396
-gerrit
commit 24573fb3652b648f4affe890d45836b11550b20e
Author: Ronald G. Minnich <rminnich(a)gmail.com>
Date: Thu Feb 14 14:50:10 2013 -0800
libpayload: only compile drivers/serial.c on machines that it works on
Create a new serial control variable, X86_SERIAL_CONSOLE (I think
a better name is likely needed) which is only enabled when both
SERIAL_CONSOLE and ARCH_X86 are defined.
Builds for arm and x86 now. Not tested for Power PC; I think we
need to decide what to do about that platform (later).
Change-Id: If9cf7caecf0b9541ada906899058f4a3bb5c7737
Signed-off-by: Ronald G. Minnich <rminnich(a)gmail.com>
---
payloads/libpayload/Config.in | 7 ++++++-
payloads/libpayload/drivers/Makefile.inc | 2 +-
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/payloads/libpayload/Config.in b/payloads/libpayload/Config.in
index a14291d..7efbc2b 100644
--- a/payloads/libpayload/Config.in
+++ b/payloads/libpayload/Config.in
@@ -168,9 +168,14 @@ config SERIAL_CONSOLE
bool "See output on the serial port console"
default y
+config X86_SERIAL_CONSOLE
+ bool
+ depends on ARCH_X86 && SERIAL_CONSOLE
+ default y
+
config SERIAL_IOBASE
hex "I/O base for the serial port (default 0x3f8)"
- depends on SERIAL_CONSOLE
+ depends on ARCH_X86 && SERIAL_CONSOLE
default 0x3f8
config SERIAL_SET_SPEED
diff --git a/payloads/libpayload/drivers/Makefile.inc b/payloads/libpayload/drivers/Makefile.inc
index e3bb995..60e0fab 100644
--- a/payloads/libpayload/drivers/Makefile.inc
+++ b/payloads/libpayload/drivers/Makefile.inc
@@ -33,7 +33,7 @@ libc-$(CONFIG_PCI) += pci.c
libc-$(CONFIG_SPEAKER) += speaker.c
-libc-$(CONFIG_SERIAL_CONSOLE) += serial.c
+libc-$(CONFIG_X86_SERIAL_CONSOLE) += serial.c
libc-$(CONFIG_PC_KEYBOARD) += keyboard.c
the following patch was just integrated into master:
commit fc4823d2454fa158970da1ca49808fdb691923a6
Author: Stefan Reinauer <reinauer(a)chromium.org>
Date: Thu Feb 14 13:42:55 2013 -0800
ARMv7: Drop SKIP_LOWLEVEL_INIT
It's not used.
Change-Id: I713d60209815f0aad93f5d4d3afef9f825db427e
Signed-off-by: Stefan Reinauer <reinauer(a)google.com>
Reviewed-on: http://review.coreboot.org/2393
Reviewed-by: David Hendricks <dhendrix(a)chromium.org>
Tested-by: build bot (Jenkins)
Build-Tested: build bot (Jenkins) at Thu Feb 14 23:39:46 2013, giving +1
See http://review.coreboot.org/2393 for details.
-gerrit