coreboot February 2013

coreboot@coreboot.org

27 participants
790 discussions

New patch to review for coreboot: 2be1ac2 Exynos: Drop unused include files
by Stefan Reinauer 14 Feb '13

14 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/2395 -gerrit commit 2be1ac278c767ffe3326c658fcdaa6f5f18bf668 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

1 0

New patch to review for coreboot: 793064c libpayload: make functions static that are unused outside memory.c
by Ronald G. Minnich 14 Feb '13

14 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/2394 -gerrit commit 793064caa6de62baaa4ea2ad1a4852bc291092e1 Author: Ronald G. Minnich <rminnich(a)gmail.com> Date: Thu Feb 14 14:36:46 2013 -0800 libpayload: make functions static that are unused outside memory.c The default_ functions in memory.c are only used to initialize a weak variable. They should not be used outside memory.c. Make them invisible. Remove the declaration from libpayload.h Change-Id: Id54c1fd172c78748f01a958ce4065dd0eb53bbc3 Signed-off-by: Ronald G. Minnich <rminnich(a)gmail.com> --- payloads/libpayload/include/libpayload.h | 5 +++++ payloads/libpayload/libc/memory.c | 29 +++++++++++++++-------------- 2 files changed, 20 insertions(+), 14 deletions(-) diff --git a/payloads/libpayload/include/libpayload.h b/payloads/libpayload/include/libpayload.h index eaa0d0d..d1b9de8 100644 --- a/payloads/libpayload/include/libpayload.h +++ b/payloads/libpayload/include/libpayload.h @@ -294,6 +294,11 @@ long long int llabs(long long int j); u8 bin2hex(u8 b); u8 hex2bin(u8 h); void fatal(const char *msg) __attribute__ ((noreturn)); + +void *default_memset(void *s, int c, size_t n); +void *default_memcpy(void *dst, const void *src, size_t n); +void *default_memmove(void *dst, const void *src, size_t n); +int default_memcmp(const void *s1, const void *s2, size_t len); /** @} */ diff --git a/payloads/libpayload/libc/memory.c b/payloads/libpayload/libc/memory.c index 5af8538..12d7e33 100644 --- a/payloads/libpayload/libc/memory.c +++ b/payloads/libpayload/libc/memory.c @@ -33,10 +33,7 @@ #include <libpayload.h> -void *memset(void *s, int c, size_t n) - __attribute__((weak, alias("default_memset"))); - -void *default_memset(void *s, int c, size_t n) +static void *default_memset(void *s, int c, size_t n) { char *os = s; @@ -46,10 +43,10 @@ void *default_memset(void *s, int c, size_t n) return s; } -void *memcpy(void *dst, const void *src, size_t n) - __attribute__((weak, alias("default_memcpy"))); +void *memset(void *s, int c, size_t n) + __attribute__((weak, alias("default_memset"))); -void *default_memcpy(void *dst, const void *src, size_t n) +static void *default_memcpy(void *dst, const void *src, size_t n) { int i; void *ret = dst; @@ -67,10 +64,10 @@ void *default_memcpy(void *dst, const void *src, size_t n) return ret; } -void *memmove(void *dst, const void *src, size_t n) - __attribute__((weak, alias("default_memmove"))); +void *memcpy(void *dst, const void *src, size_t n) + __attribute__((weak, alias("default_memcpy"))); -void *default_memmove(void *dst, const void *src, size_t n) +static void *default_memmove(void *dst, const void *src, size_t n) { int i; unsigned long offs; @@ -90,6 +87,9 @@ void *default_memmove(void *dst, const void *src, size_t n) return dst; } +void *memmove(void *dst, const void *src, size_t n) + __attribute__((weak, alias("default_memmove"))); + /** * Compare two memory areas. * @@ -100,11 +100,12 @@ void *default_memmove(void *dst, const void *src, size_t n) * Otherwise return non-zero. */ -int memcmp(const void *s1, const void *s2, size_t len) - __attribute__((weak, alias("default_memcmp"))); - -int default_memcmp(const void *s1, const void *s2, size_t len) +static int default_memcmp(const void *s1, const void *s2, size_t len) { for (; len && *(char *)s1++ == *(char *)s2++; len--) ; return len; } + +int memcmp(const void *s1, const void *s2, size_t len) + __attribute__((weak, alias("default_memcmp"))); +

1 0

Patch merged into coreboot/master: f151a81 Exynos5250: Drop SHA implementation
by gerrit＠coreboot.org 14 Feb '13

14 Feb '13

the following patch was just integrated into master: commit f151a81f8b348bb0ec0f65259f1cc9a25880a97f Author: Stefan Reinauer <reinauer(a)chromium.org> Date: Thu Feb 14 13:36:52 2013 -0800 Exynos5250: Drop SHA implementation We don't need SHA in coreboot. Change-Id: I1985d5e2c74fac39ff9dcdba4c23bb34fa857ec7 Signed-off-by: Stefan Reinauer <reinauer(a)google.com> Reviewed-on: http://review.coreboot.org/2390 Reviewed-by: David Hendricks <dhendrix(a)chromium.org> Tested-by: build bot (Jenkins) Build-Tested: build bot (Jenkins) at Thu Feb 14 23:15:11 2013, giving +1 Reviewed-By: David Hendricks <dhendrix(a)chromium.org> at Thu Feb 14 23:10:48 2013, giving +2 See http://review.coreboot.org/2390 for details. -gerrit

1 0

New patch to review for coreboot: 4a136e7 ARMv7: Drop SKIP_LOWLEVEL_INIT
by Stefan Reinauer 14 Feb '13

14 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/2393 -gerrit commit 4a136e7482cda8cea63f19a46225220c824af641 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> --- src/arch/armv7/include/common.h | 7 ------- src/cpu/samsung/Kconfig | 7 ------- 2 files changed, 14 deletions(-) diff --git a/src/arch/armv7/include/common.h b/src/arch/armv7/include/common.h index d8698db..d00aecf 100644 --- a/src/arch/armv7/include/common.h +++ b/src/arch/armv7/include/common.h @@ -444,13 +444,6 @@ int cpu_release(int nr, int argc, char * const argv[]); #endif #endif -#ifdef CONFIG_INIT_CRITICAL -#error CONFIG_INIT_CRITICAL is deprecated! -#error Read section CONFIG_SKIP_LOWLEVEL_INIT in README. -#endif - -//#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) - #define ROUND(a,b) (((a) + (b) - 1) & ~((b) - 1)) #define DIV_ROUND(n,d) (((n) + ((d)/2)) / (d)) #define DIV_ROUND_UP(n,d) (((n) + (d) - 1) / (d)) diff --git a/src/cpu/samsung/Kconfig b/src/cpu/samsung/Kconfig index c2ee5b4..9f833f3 100644 --- a/src/cpu/samsung/Kconfig +++ b/src/cpu/samsung/Kconfig @@ -10,13 +10,6 @@ config CPU_SAMSUNG_EXYNOS5 bool default n -config SKIP_LOWLEVEL_INIT - bool "Skip low-level init" - default n - help - Certain functions (ie PLL init) and processor features may already be - handled by masked ROM code. - if CPU_SAMSUNG_EXYNOS5 source src/cpu/samsung/exynos5250/Kconfig endif

1 0

New patch to review for coreboot: 3f2008b ARMv7: drop multiboot support
by Stefan Reinauer 14 Feb '13

14 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/2392 -gerrit commit 3f2008b68c75aac5b3b6d39b777f885085031011 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> --- src/Kconfig | 1 + src/arch/armv7/boot/multiboot.c | 77 ----------------------------------------- 2 files changed, 1 insertion(+), 77 deletions(-) diff --git a/src/Kconfig b/src/Kconfig index 726fa39..4e7957e 100644 --- a/src/Kconfig +++ b/src/Kconfig @@ -413,6 +413,7 @@ config WRITE_HIGH_TABLES config MULTIBOOT bool "Generate Multiboot tables (for GRUB2)" default y + depends on ARCH_X86 config GENERATE_ACPI_TABLES prompt "Generate ACPI tables" if HAVE_ACPI_TABLES diff --git a/src/arch/armv7/boot/multiboot.c b/src/arch/armv7/boot/multiboot.c deleted file mode 100644 index 4059f27..0000000 --- a/src/arch/armv7/boot/multiboot.c +++ /dev/null @@ -1,77 +0,0 @@ -/* - * support for Multiboot payloads - * - * Copyright (C) 2008 Robert Millan - * - * 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, see <http://www.gnu.org/licenses/>. - * - */ - -#include <cpu/x86/multiboot.h> -#include <string.h> -#include <device/resource.h> -#include <console/console.h> -#include <boot/coreboot_tables.h> -#include <arch/coreboot_tables.h> - -struct multiboot_info *mbi = NULL; - -unsigned long write_multiboot_info(unsigned long rom_table_end) -{ - static struct multiboot_mmap_entry *mb_mem; - struct lb_memory* coreboot_table; - int entries; - int i; - - mbi = (struct multiboot_info *)rom_table_end; - - memset(mbi, 0, sizeof(*mbi)); - rom_table_end += sizeof(*mbi); - - mbi->mmap_addr = (u32) rom_table_end; - mb_mem = (struct multiboot_mmap_entry *)rom_table_end; - - /* copy regions from coreboot tables */ - coreboot_table = get_lb_mem(); - entries = (coreboot_table->size - sizeof(*coreboot_table))/sizeof(coreboot_table->map[0]); - - if (coreboot_table == NULL || entries < 1) { - printk(BIOS_INFO, "%s: Cannot find coreboot table.\n", __func__); - return (unsigned long) mb_mem; - } - - for (i = 0; i < entries; i++) { - uint64_t entry_start = unpack_lb64(coreboot_table->map[i].start); - uint64_t entry_size = unpack_lb64(coreboot_table->map[i].size); - mb_mem->addr = entry_start; - mb_mem->len = entry_size; - switch (coreboot_table->map[i].type) { - case LB_MEM_RAM: - mb_mem->type = MULTIBOOT_MEMORY_AVAILABLE; - break; - default: // anything other than usable RAM - mb_mem->type = MULTIBOOT_MEMORY_RESERVED; - break; - } - mb_mem->size = sizeof(*mb_mem) - sizeof(mb_mem->size); - mb_mem++; - } - - mbi->mmap_length = ((u32) mb_mem) - mbi->mmap_addr; - mbi->flags |= MB_INFO_MEM_MAP; - - printk(BIOS_INFO, "Multiboot Information structure has been written.\n"); - - return (unsigned long)mb_mem; -}

1 0

New patch to review for coreboot: 2a83379 Exynos: Drop duplicate copy of watchdog.h
by Stefan Reinauer 14 Feb '13

14 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/2391 -gerrit commit 2a833793bb87a5ae97edbeff587ae0260460eb96 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> --- src/cpu/samsung/exynos5-common/watchdog.h | 57 ------------------------------- src/cpu/samsung/exynos5250/watchdog.h | 27 --------------- src/cpu/samsung/s5p-common/watchdog.h | 5 ++- 3 files changed, 2 insertions(+), 87 deletions(-) diff --git a/src/cpu/samsung/exynos5-common/watchdog.h b/src/cpu/samsung/exynos5-common/watchdog.h deleted file mode 100644 index 5b3b651..0000000 --- a/src/cpu/samsung/exynos5-common/watchdog.h +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Copyright (C) 2011 Samsung Electronics - * Heungjun Kim <riverful.kim(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 __ASM_ARM_ARCH_COMMON_WATCHDOG_H_ -#define __ASM_ARM_ARCH_COMMON_WATCHDOG_H_ - -#define WTCON_RESET_OFFSET 0 -#define WTCON_INTEN_OFFSET 2 -#define WTCON_CLKSEL_OFFSET 3 -#define WTCON_EN_OFFSET 5 -#define WTCON_PRE_OFFSET 8 - -#define WTCON_CLK_16 0x0 -#define WTCON_CLK_32 0x1 -#define WTCON_CLK_64 0x2 -#define WTCON_CLK_128 0x3 - -#define WTCON_CLK(x) ((x & 0x3) << WTCON_CLKSEL_OFFSET) -#define WTCON_PRESCALER(x) ((x) << WTCON_PRE_OFFSET) -#define WTCON_EN (0x1 << WTCON_EN_OFFSET) -#define WTCON_RESET (0x1 << WTCON_RESET_OFFSET) -#define WTCON_INT (0x1 << WTCON_INTEN_OFFSET) - -#ifndef __ASSEMBLER__ -struct s5p_watchdog { - unsigned int wtcon; - unsigned int wtdat; - unsigned int wtcnt; - unsigned int wtclrint; -}; - -/* functions */ -void wdt_stop(void); -void wdt_start(unsigned int timeout); -#endif /* __ASSEMBLER__ */ - -#endif diff --git a/src/cpu/samsung/exynos5250/watchdog.h b/src/cpu/samsung/exynos5250/watchdog.h deleted file mode 100644 index f35dde4..0000000 --- a/src/cpu/samsung/exynos5250/watchdog.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_WATCHDOG_H__ -#define __ASM_ARM_ARCH_EXYNOS5_WATCHDOG_H__ - -#include <asm/arch-exynos/watchdog.h> - -#endif /* __ASM_ARM_ARCH_EXYNOS5_WATCHDOG_H__ */ diff --git a/src/cpu/samsung/s5p-common/watchdog.h b/src/cpu/samsung/s5p-common/watchdog.h index 8c8bf0a..5b3b651 100644 --- a/src/cpu/samsung/s5p-common/watchdog.h +++ b/src/cpu/samsung/s5p-common/watchdog.h @@ -1,7 +1,6 @@ /* * Copyright (C) 2011 Samsung Electronics * Heungjun Kim <riverful.kim(a)samsung.com> - * Minkyu Kang <mk7.kang(a)samsung.com> * * See file CREDITS for list of people who contributed to this * project. @@ -22,8 +21,8 @@ * MA 02111-1307 USA */ -#ifndef __ASM_ARM_ARCH_WATCHDOG_H_ -#define __ASM_ARM_ARCH_WATCHDOG_H_ +#ifndef __ASM_ARM_ARCH_COMMON_WATCHDOG_H_ +#define __ASM_ARM_ARCH_COMMON_WATCHDOG_H_ #define WTCON_RESET_OFFSET 0 #define WTCON_INTEN_OFFSET 2

1 0

New patch to review for coreboot: af05241 Exynos5250: Drop SHA implementation
by Stefan Reinauer 14 Feb '13

14 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/2390 -gerrit commit af052415102dbe9660afd722b2c866b1e369dcbc Author: Stefan Reinauer <reinauer(a)chromium.org> Date: Thu Feb 14 13:36:52 2013 -0800 Exynos5250: Drop SHA implementation We don't need SHA in coreboot. Change-Id: I1985d5e2c74fac39ff9dcdba4c23bb34fa857ec7 Signed-off-by: Stefan Reinauer <reinauer(a)google.com> --- src/cpu/samsung/exynos5250/Makefile.inc | 1 - src/cpu/samsung/exynos5250/ace_sfr.h | 310 -------------------------------- src/cpu/samsung/exynos5250/ace_sha.c | 118 ------------ src/cpu/samsung/exynos5250/ace_sha.h | 41 ----- 4 files changed, 470 deletions(-) diff --git a/src/cpu/samsung/exynos5250/Makefile.inc b/src/cpu/samsung/exynos5250/Makefile.inc index 0a58c0c..ec6b0e1 100644 --- a/src/cpu/samsung/exynos5250/Makefile.inc +++ b/src/cpu/samsung/exynos5250/Makefile.inc @@ -28,7 +28,6 @@ ramstage-y += power.c ramstage-y += soc.c ramstage-$(CONFIG_CONSOLE_SERIAL_UART) += uart.c -#ramstage-$(CONFIG_EXYNOS_ACE_SHA) += ace_sha.c #ramstage-$(CONFIG_SATA_AHCI) += sata.c exynos5250_add_bl1: $(obj)/coreboot.pre diff --git a/src/cpu/samsung/exynos5250/ace_sfr.h b/src/cpu/samsung/exynos5250/ace_sfr.h deleted file mode 100644 index 8f1c893..0000000 --- a/src/cpu/samsung/exynos5250/ace_sfr.h +++ /dev/null @@ -1,310 +0,0 @@ -/* - * Header file for Advanced Crypto Engine - SFR definitions - * - * Copyright (c) 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 __ACE_SFR_H -#define __ACE_SFR_H - -struct exynos_ace_sfr { - unsigned int fc_intstat; /* base + 0 */ - unsigned int fc_intenset; - unsigned int fc_intenclr; - unsigned int fc_intpend; - unsigned int fc_fifostat; - unsigned int fc_fifoctrl; - unsigned int fc_global; - unsigned int res1; - unsigned int fc_brdmas; - unsigned int fc_brdmal; - unsigned int fc_brdmac; - unsigned int res2; - unsigned int fc_btdmas; - unsigned int fc_btdmal; - unsigned int fc_btdmac; - unsigned int res3; - unsigned int fc_hrdmas; - unsigned int fc_hrdmal; - unsigned int fc_hrdmac; - unsigned int res4; - unsigned int fc_pkdmas; - unsigned int fc_pkdmal; - unsigned int fc_pkdmac; - unsigned int fc_pkdmao; - unsigned char res5[0x1a0]; - - unsigned int aes_control; /* base + 0x200 */ - unsigned int aes_status; - unsigned char res6[0x8]; - unsigned int aes_in[4]; - unsigned int aes_out[4]; - unsigned int aes_iv[4]; - unsigned int aes_cnt[4]; - unsigned char res7[0x30]; - unsigned int aes_key[8]; - unsigned char res8[0x60]; - - unsigned int tdes_control; /* base + 0x300 */ - unsigned int tdes_status; - unsigned char res9[0x8]; - unsigned int tdes_key[6]; - unsigned int tdes_iv[2]; - unsigned int tdes_in[2]; - unsigned int tdes_out[2]; - unsigned char res10[0xc0]; - - unsigned int hash_control; /* base + 0x400 */ - unsigned int hash_control2; - unsigned int hash_fifo_mode; - unsigned int hash_byteswap; - unsigned int hash_status; - unsigned char res11[0xc]; - unsigned int hash_msgsize_low; - unsigned int hash_msgsize_high; - unsigned int hash_prelen_low; - unsigned int hash_prelen_high; - unsigned int hash_in[16]; - unsigned int hash_key_in[16]; - unsigned int hash_iv[8]; - unsigned char res12[0x30]; - unsigned int hash_result[8]; - unsigned char res13[0x20]; - unsigned int hash_seed[8]; - unsigned int hash_prng[8]; - unsigned char res14[0x180]; - - unsigned int pka_sfr[5]; /* base + 0x700 */ -}; - -/* ACE_FC_INT */ -#define ACE_FC_PKDMA (1 << 0) -#define ACE_FC_HRDMA (1 << 1) -#define ACE_FC_BTDMA (1 << 2) -#define ACE_FC_BRDMA (1 << 3) -#define ACE_FC_PRNG_ERROR (1 << 4) -#define ACE_FC_MSG_DONE (1 << 5) -#define ACE_FC_PRNG_DONE (1 << 6) -#define ACE_FC_PARTIAL_DONE (1 << 7) - -/* ACE_FC_FIFOSTAT */ -#define ACE_FC_PKFIFO_EMPTY (1 << 0) -#define ACE_FC_PKFIFO_FULL (1 << 1) -#define ACE_FC_HRFIFO_EMPTY (1 << 2) -#define ACE_FC_HRFIFO_FULL (1 << 3) -#define ACE_FC_BTFIFO_EMPTY (1 << 4) -#define ACE_FC_BTFIFO_FULL (1 << 5) -#define ACE_FC_BRFIFO_EMPTY (1 << 6) -#define ACE_FC_BRFIFO_FULL (1 << 7) - -/* ACE_FC_FIFOCTRL */ -#define ACE_FC_SELHASH_MASK (3 << 0) -#define ACE_FC_SELHASH_EXOUT (0 << 0) /* independent source */ -#define ACE_FC_SELHASH_BCIN (1 << 0) /* blk cipher input */ -#define ACE_FC_SELHASH_BCOUT (2 << 0) /* blk cipher output */ -#define ACE_FC_SELBC_MASK (1 << 2) -#define ACE_FC_SELBC_AES (0 << 2) /* AES */ -#define ACE_FC_SELBC_DES (1 << 2) /* DES */ - -/* ACE_FC_GLOBAL */ -#define ACE_FC_SSS_RESET (1 << 0) -#define ACE_FC_DMA_RESET (1 << 1) -#define ACE_FC_AES_RESET (1 << 2) -#define ACE_FC_DES_RESET (1 << 3) -#define ACE_FC_HASH_RESET (1 << 4) -#define ACE_FC_AXI_ENDIAN_MASK (3 << 6) -#define ACE_FC_AXI_ENDIAN_LE (0 << 6) -#define ACE_FC_AXI_ENDIAN_BIBE (1 << 6) -#define ACE_FC_AXI_ENDIAN_WIBE (2 << 6) - -/* Feed control - BRDMA control */ -#define ACE_FC_BRDMACFLUSH_OFF (0 << 0) -#define ACE_FC_BRDMACFLUSH_ON (1 << 0) -#define ACE_FC_BRDMACSWAP_ON (1 << 1) -#define ACE_FC_BRDMACARPROT_MASK (0x7 << 2) -#define ACE_FC_BRDMACARPROT_OFS (2) -#define ACE_FC_BRDMACARCACHE_MASK (0xf << 5) -#define ACE_FC_BRDMACARCACHE_OFS (5) - -/* Feed control - BTDMA control */ -#define ACE_FC_BTDMACFLUSH_OFF (0 << 0) -#define ACE_FC_BTDMACFLUSH_ON (1 << 0) -#define ACE_FC_BTDMACSWAP_ON (1 << 1) -#define ACE_FC_BTDMACAWPROT_MASK (0x7 << 2) -#define ACE_FC_BTDMACAWPROT_OFS (2) -#define ACE_FC_BTDMACAWCACHE_MASK (0xf << 5) -#define ACE_FC_BTDMACAWCACHE_OFS (5) - -/* Feed control - HRDMA control */ -#define ACE_FC_HRDMACFLUSH_OFF (0 << 0) -#define ACE_FC_HRDMACFLUSH_ON (1 << 0) -#define ACE_FC_HRDMACSWAP_ON (1 << 1) -#define ACE_FC_HRDMACARPROT_MASK (0x7 << 2) -#define ACE_FC_HRDMACARPROT_OFS (2) -#define ACE_FC_HRDMACARCACHE_MASK (0xf << 5) -#define ACE_FC_HRDMACARCACHE_OFS (5) - -/* Feed control - PKDMA control */ -#define ACE_FC_PKDMACBYTESWAP_ON (1 << 3) -#define ACE_FC_PKDMACDESEND_ON (1 << 2) -#define ACE_FC_PKDMACTRANSMIT_ON (1 << 1) -#define ACE_FC_PKDMACFLUSH_ON (1 << 0) - -/* Feed control - PKDMA offset */ -#define ACE_FC_SRAMOFFSET_MASK (0xfff) - -/* AES control */ -#define ACE_AES_MODE_MASK (1 << 0) -#define ACE_AES_MODE_ENC (0 << 0) -#define ACE_AES_MODE_DEC (1 << 0) -#define ACE_AES_OPERMODE_MASK (3 << 1) -#define ACE_AES_OPERMODE_ECB (0 << 1) -#define ACE_AES_OPERMODE_CBC (1 << 1) -#define ACE_AES_OPERMODE_CTR (2 << 1) -#define ACE_AES_FIFO_MASK (1 << 3) -#define ACE_AES_FIFO_OFF (0 << 3) /* CPU mode */ -#define ACE_AES_FIFO_ON (1 << 3) /* FIFO mode */ -#define ACE_AES_KEYSIZE_MASK (3 << 4) -#define ACE_AES_KEYSIZE_128 (0 << 4) -#define ACE_AES_KEYSIZE_192 (1 << 4) -#define ACE_AES_KEYSIZE_256 (2 << 4) -#define ACE_AES_KEYCNGMODE_MASK (1 << 6) -#define ACE_AES_KEYCNGMODE_OFF (0 << 6) -#define ACE_AES_KEYCNGMODE_ON (1 << 6) -#define ACE_AES_SWAP_MASK (0x1f << 7) -#define ACE_AES_SWAPKEY_OFF (0 << 7) -#define ACE_AES_SWAPKEY_ON (1 << 7) -#define ACE_AES_SWAPCNT_OFF (0 << 8) -#define ACE_AES_SWAPCNT_ON (1 << 8) -#define ACE_AES_SWAPIV_OFF (0 << 9) -#define ACE_AES_SWAPIV_ON (1 << 9) -#define ACE_AES_SWAPDO_OFF (0 << 10) -#define ACE_AES_SWAPDO_ON (1 << 10) -#define ACE_AES_SWAPDI_OFF (0 << 11) -#define ACE_AES_SWAPDI_ON (1 << 11) -#define ACE_AES_COUNTERSIZE_MASK (3 << 12) -#define ACE_AES_COUNTERSIZE_128 (0 << 12) -#define ACE_AES_COUNTERSIZE_64 (1 << 12) -#define ACE_AES_COUNTERSIZE_32 (2 << 12) -#define ACE_AES_COUNTERSIZE_16 (3 << 12) - -/* AES status */ -#define ACE_AES_OUTRDY_MASK (1 << 0) -#define ACE_AES_OUTRDY_OFF (0 << 0) -#define ACE_AES_OUTRDY_ON (1 << 0) -#define ACE_AES_INRDY_MASK (1 << 1) -#define ACE_AES_INRDY_OFF (0 << 1) -#define ACE_AES_INRDY_ON (1 << 1) -#define ACE_AES_BUSY_MASK (1 << 2) -#define ACE_AES_BUSY_OFF (0 << 2) -#define ACE_AES_BUSY_ON (1 << 2) - -/* TDES control */ -#define ACE_TDES_MODE_MASK (1 << 0) -#define ACE_TDES_MODE_ENC (0 << 0) -#define ACE_TDES_MODE_DEC (1 << 0) -#define ACE_TDES_OPERMODE_MASK (1 << 1) -#define ACE_TDES_OPERMODE_ECB (0 << 1) -#define ACE_TDES_OPERMODE_CBC (1 << 1) -#define ACE_TDES_SEL_MASK (3 << 3) -#define ACE_TDES_SEL_DES (0 << 3) -#define ACE_TDES_SEL_TDESEDE (1 << 3) /* TDES EDE mode */ -#define ACE_TDES_SEL_TDESEEE (3 << 3) /* TDES EEE mode */ -#define ACE_TDES_FIFO_MASK (1 << 5) -#define ACE_TDES_FIFO_OFF (0 << 5) /* CPU mode */ -#define ACE_TDES_FIFO_ON (1 << 5) /* FIFO mode */ -#define ACE_TDES_SWAP_MASK (0xf << 6) -#define ACE_TDES_SWAPKEY_OFF (0 << 6) -#define ACE_TDES_SWAPKEY_ON (1 << 6) -#define ACE_TDES_SWAPIV_OFF (0 << 7) -#define ACE_TDES_SWAPIV_ON (1 << 7) -#define ACE_TDES_SWAPDO_OFF (0 << 8) -#define ACE_TDES_SWAPDO_ON (1 << 8) -#define ACE_TDES_SWAPDI_OFF (0 << 9) -#define ACE_TDES_SWAPDI_ON (1 << 9) - -/* TDES status */ -#define ACE_TDES_OUTRDY_MASK (1 << 0) -#define ACE_TDES_OUTRDY_OFF (0 << 0) -#define ACE_TDES_OUTRDY_ON (1 << 0) -#define ACE_TDES_INRDY_MASK (1 << 1) -#define ACE_TDES_INRDY_OFF (0 << 1) -#define ACE_TDES_INRDY_ON (1 << 1) -#define ACE_TDES_BUSY_MASK (1 << 2) -#define ACE_TDES_BUSY_OFF (0 << 2) -#define ACE_TDES_BUSY_ON (1 << 2) - -/* Hash control */ -#define ACE_HASH_ENGSEL_MASK (0xf << 0) -#define ACE_HASH_ENGSEL_SHA1HASH (0x0 << 0) -#define ACE_HASH_ENGSEL_SHA1HMAC (0x1 << 0) -#define ACE_HASH_ENGSEL_SHA1HMACIN (0x1 << 0) -#define ACE_HASH_ENGSEL_SHA1HMACOUT (0x9 << 0) -#define ACE_HASH_ENGSEL_MD5HASH (0x2 << 0) -#define ACE_HASH_ENGSEL_MD5HMAC (0x3 << 0) -#define ACE_HASH_ENGSEL_MD5HMACIN (0x3 << 0) -#define ACE_HASH_ENGSEL_MD5HMACOUT (0xb << 0) -#define ACE_HASH_ENGSEL_SHA256HASH (0x4 << 0) -#define ACE_HASH_ENGSEL_SHA256HMAC (0x5 << 0) -#define ACE_HASH_ENGSEL_PRNG (0x8 << 0) -#define ACE_HASH_STARTBIT_ON (1 << 4) -#define ACE_HASH_USERIV_EN (1 << 5) - -/* Hash control 2 */ -#define ACE_HASH_PAUSE_ON (1 << 0) - -/* Hash control - FIFO mode */ -#define ACE_HASH_FIFO_MASK (1 << 0) -#define ACE_HASH_FIFO_OFF (0 << 0) -#define ACE_HASH_FIFO_ON (1 << 0) - -/* Hash control - byte swap */ -#define ACE_HASH_SWAP_MASK (0xf << 0) -#define ACE_HASH_SWAPKEY_OFF (0 << 0) -#define ACE_HASH_SWAPKEY_ON (1 << 0) -#define ACE_HASH_SWAPIV_OFF (0 << 1) -#define ACE_HASH_SWAPIV_ON (1 << 1) -#define ACE_HASH_SWAPDO_OFF (0 << 2) -#define ACE_HASH_SWAPDO_ON (1 << 2) -#define ACE_HASH_SWAPDI_OFF (0 << 3) -#define ACE_HASH_SWAPDI_ON (1 << 3) - -/* Hash status */ -#define ACE_HASH_BUFRDY_MASK (1 << 0) -#define ACE_HASH_BUFRDY_OFF (0 << 0) -#define ACE_HASH_BUFRDY_ON (1 << 0) -#define ACE_HASH_SEEDSETTING_MASK (1 << 1) -#define ACE_HASH_SEEDSETTING_OFF (0 << 1) -#define ACE_HASH_SEEDSETTING_ON (1 << 1) -#define ACE_HASH_PRNGBUSY_MASK (1 << 2) -#define ACE_HASH_PRNGBUSY_OFF (0 << 2) -#define ACE_HASH_PRNGBUSY_ON (1 << 2) -#define ACE_HASH_PARTIALDONE_MASK (1 << 4) -#define ACE_HASH_PARTIALDONE_OFF (0 << 4) -#define ACE_HASH_PARTIALDONE_ON (1 << 4) -#define ACE_HASH_PRNGDONE_MASK (1 << 5) -#define ACE_HASH_PRNGDONE_OFF (0 << 5) -#define ACE_HASH_PRNGDONE_ON (1 << 5) -#define ACE_HASH_MSGDONE_MASK (1 << 6) -#define ACE_HASH_MSGDONE_OFF (0 << 6) -#define ACE_HASH_MSGDONE_ON (1 << 6) -#define ACE_HASH_PRNGERROR_MASK (1 << 7) -#define ACE_HASH_PRNGERROR_OFF (0 << 7) -#define ACE_HASH_PRNGERROR_ON (1 << 7) - -#endif diff --git a/src/cpu/samsung/exynos5250/ace_sha.c b/src/cpu/samsung/exynos5250/ace_sha.c deleted file mode 100644 index 2715a03..0000000 --- a/src/cpu/samsung/exynos5250/ace_sha.c +++ /dev/null @@ -1,118 +0,0 @@ -/* - * Advanced Crypto Engine - SHA Firmware - * - * Copyright (c) 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 - * - */ -#include <common.h> -#include <asm/arch/ace_sha.h> -#include <asm/arch/ace_sfr.h> - -/* Maximum input data size is 8 MB. Timeout observed for data size above 8MB */ -#define TIMEOUT_MS 100 - -#define SHA1_DIGEST_LEN 20 -#define SHA256_DIGEST_LEN 32 - -/* SHA1 value for the message of zero length */ -static const unsigned char sha1_digest_emptymsg[SHA1_DIGEST_LEN] = { - 0xDA, 0x39, 0xA3, 0xEE, 0x5E, 0x6B, 0x4B, 0x0D, - 0x32, 0x55, 0xBF, 0xFF, 0x95, 0x60, 0x18, 0x90, - 0xAF, 0xD8, 0x07, 0x09}; - -/* SHA256 value for the message of zero length */ -static const unsigned char sha256_digest_emptymsg[SHA256_DIGEST_LEN] = { - 0xE3, 0xB0, 0xC4, 0x42, 0x98, 0xFC, 0x1C, 0x14, - 0x9A, 0xFB, 0xF4, 0xC8, 0x99, 0x6F, 0xB9, 0x24, - 0x27, 0xAE, 0x41, 0xE4, 0x64, 0x9B, 0x93, 0x4C, - 0xA4, 0x95, 0x99, 0x1B, 0x78, 0x52, 0xB8, 0x55}; - -int ace_sha_hash_digest( - unsigned char *pout, unsigned char *pbuf, - unsigned int buf_len, unsigned int hash_type) -{ - unsigned int i, reg, len; - unsigned int *pdigest; - ulong start; - struct exynos_ace_sfr *ace_sha_reg = - (struct exynos_ace_sfr *) samsung_get_base_ace_sfr(); - - if (buf_len == 0) { - /* ACE H/W cannot compute hash value for empty string */ - if (hash_type == ACE_SHA_TYPE_SHA1) - memcpy(pout, sha1_digest_emptymsg, SHA1_DIGEST_LEN); - else - memcpy(pout, sha256_digest_emptymsg, SHA256_DIGEST_LEN); - return 0; - } - - /* Flush HRDMA */ - writel(ACE_FC_HRDMACFLUSH_ON, &ace_sha_reg->fc_hrdmac); - writel(ACE_FC_HRDMACFLUSH_OFF, &ace_sha_reg->fc_hrdmac); - - /* Set byte swap of data in */ - writel(ACE_HASH_SWAPDI_ON | ACE_HASH_SWAPDO_ON | ACE_HASH_SWAPIV_ON, - &ace_sha_reg->hash_byteswap); - - /* Select Hash input mux as external source */ - reg = readl(&ace_sha_reg->fc_fifoctrl); - reg = (reg & ~ACE_FC_SELHASH_MASK) | ACE_FC_SELHASH_EXOUT; - writel(reg, &ace_sha_reg->fc_fifoctrl); - - /* Set Hash as SHA1 or SHA256 and start Hash engine */ - reg = (hash_type == ACE_SHA_TYPE_SHA1) ? - ACE_HASH_ENGSEL_SHA1HASH : ACE_HASH_ENGSEL_SHA256HASH; - reg |= ACE_HASH_STARTBIT_ON; - writel(reg, &ace_sha_reg->hash_control); - - /* Enable FIFO mode */ - writel(ACE_HASH_FIFO_ON, &ace_sha_reg->hash_fifo_mode); - - /* Set message length */ - writel(buf_len, &ace_sha_reg->hash_msgsize_low); - writel(0, &ace_sha_reg->hash_msgsize_high); - - /* Set HRDMA */ - writel((unsigned int)pbuf, &ace_sha_reg->fc_hrdmas); - writel(buf_len, &ace_sha_reg->fc_hrdmal); - - start = get_timer(0); - - while ((readl(&ace_sha_reg->hash_status) & ACE_HASH_MSGDONE_MASK) == - ACE_HASH_MSGDONE_OFF) { - - if (get_timer(start) > TIMEOUT_MS) { - debug("%s: Timeout waiting for ACE\n", __func__); - return -1; - } - } - - /* Clear MSG_DONE bit */ - writel(ACE_HASH_MSGDONE_ON, &ace_sha_reg->hash_status); - - /* Read hash result */ - pdigest = (unsigned int *)pout; - len = (hash_type == ACE_SHA_TYPE_SHA1) ? 5 : 8; - - for (i = 0; i < len ; i++) - pdigest[i] = readl(&ace_sha_reg->hash_result[i]); - - /* Clear HRDMA pending bit */ - writel(ACE_FC_HRDMA, &ace_sha_reg->fc_intpend); - - return 0; -} diff --git a/src/cpu/samsung/exynos5250/ace_sha.h b/src/cpu/samsung/exynos5250/ace_sha.h deleted file mode 100644 index ed4e4d5..0000000 --- a/src/cpu/samsung/exynos5250/ace_sha.h +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Header file for SHA firmware - * - * Copyright (c) 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 __ACE_FW_SHA1_H -#define __ACE_FW_SHA1_H - -#define ACE_SHA_TYPE_SHA1 1 -#define ACE_SHA_TYPE_SHA256 2 - -/** - * Computes hash value of input pbuf using ACE - * - * @param pout A pointer to the output buffer. When complete - * 32 bytes are copied to pout[0]...pout[31]. Thus, a user - * should allocate at least 32 bytes at pOut in advance. - * @param pbuf A pointer to the input buffer - * @param buflen Byte length of input buffer - * @param hash_type SHA1 or SHA256 - * - * @return 0 Success - */ -int ace_sha_hash_digest(uchar *pout, uchar *pbuf, uint buflen, uint hash_type); - -#endif

1 0

Patch merged into coreboot/master: c2e8cf5 libpayload; put the ldscript into an arch-dependent directory path
by gerrit＠coreboot.org 14 Feb '13

14 Feb '13

the following patch was just integrated into master: commit c2e8cf56757b72b963753848d46c7932445029d5 Author: Ronald G. Minnich <rminnich(a)gmail.com> Date: Thu Feb 14 11:32:29 2013 -0800 libpayload; put the ldscript into an arch-dependent directory path Since it's utterly architecture-dependent, put it in arch/x86. Avoid the temptation to make yet another directory with just one file in it. Fix the makefile to pick up the proper arch-dependent script. Change-Id: I21ea02551a97bdcbc38419714f3b38cf8335c178 Signed-off-by: Ronald G. Minnich <rminnich(a)gmail.com> Reviewed-on: http://review.coreboot.org/2389 Tested-by: build bot (Jenkins) Reviewed-by: David Hendricks <dhendrix(a)chromium.org> Build-Tested: build bot (Jenkins) at Thu Feb 14 21:00:13 2013, giving +1 See http://review.coreboot.org/2389 for details. -gerrit

1 0

New patch to review for coreboot: 6a90a67 libpayload; put the ldscript into an arch-dependent directory path
by Ronald G. Minnich 14 Feb '13

14 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/2389 -gerrit commit 6a90a67d0987975ff68c441837f7b367f91ac2d2 Author: Ronald G. Minnich <rminnich(a)gmail.com> Date: Thu Feb 14 11:32:29 2013 -0800 libpayload; put the ldscript into an arch-dependent directory path Since it's utterly architecture-dependent, put it in arch/x86. Avoid the temptation to make yet another directory with just one file in it. Fix the makefile to pick up the proper arch-dependent script. Change-Id: I21ea02551a97bdcbc38419714f3b38cf8335c178 Signed-off-by: Ronald G. Minnich <rminnich(a)gmail.com> --- payloads/libpayload/Makefile.inc | 2 +- payloads/libpayload/arch/x86/libpayload.ldscript | 92 ++++++++++++++++++++++++ payloads/libpayload/lib/libpayload.ldscript | 92 ------------------------ 3 files changed, 93 insertions(+), 93 deletions(-) diff --git a/payloads/libpayload/Makefile.inc b/payloads/libpayload/Makefile.inc index 908d0e7..4c434a3 100644 --- a/payloads/libpayload/Makefile.inc +++ b/payloads/libpayload/Makefile.inc @@ -97,7 +97,7 @@ install: real-target for lib in $(library-targets); do \ install -m 644 $$lib $(DESTDIR)/libpayload/lib/; \ done - install -m 644 lib/libpayload.ldscript $(DESTDIR)/libpayload/lib/ + install -m 644 arch/$(ARCHDIR-y)/libpayload.ldscript $(DESTDIR)/libpayload/lib/ install -m 755 -d $(DESTDIR)/libpayload/lib/$(ARCHDIR-y) install -m 644 $(obj)/head.o $(DESTDIR)/libpayload/lib/$(ARCHDIR-y) printf " INSTALL $(DESTDIR)/libpayload/include\n" diff --git a/payloads/libpayload/arch/x86/libpayload.ldscript b/payloads/libpayload/arch/x86/libpayload.ldscript new file mode 100644 index 0000000..3e7d4cc --- /dev/null +++ b/payloads/libpayload/arch/x86/libpayload.ldscript @@ -0,0 +1,92 @@ +/* + * This file is part of the libpayload project. + * + * 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 = 0x100000; + +OUTPUT_FORMAT(elf32-i386) +OUTPUT_ARCH(i386) + +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*) + } +} diff --git a/payloads/libpayload/lib/libpayload.ldscript b/payloads/libpayload/lib/libpayload.ldscript deleted file mode 100644 index 3e7d4cc..0000000 --- a/payloads/libpayload/lib/libpayload.ldscript +++ /dev/null @@ -1,92 +0,0 @@ -/* - * This file is part of the libpayload project. - * - * 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 = 0x100000; - -OUTPUT_FORMAT(elf32-i386) -OUTPUT_ARCH(i386) - -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*) - } -}

1 0

Patch set updated for coreboot: 72e2791 Get libpayload to compile cleanly for ARMV7
by Ronald G. Minnich 14 Feb '13

14 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/2387 -gerrit commit 72e2791e485d65ba29b999da4c1ca4415e3e48d5 Author: Ronald G. Minnich <rminnich(a)gmail.com> Date: Thu Feb 14 09:54:57 2013 -0800 Get libpayload to compile cleanly for ARMV7 There were just a few nits: on ARM, in/out and read/write are the same, so create synonyms. Get rid of some the nested if bits; add needed function prototypes (that did not used to be needed). This is prep work for getting more ARM drivers into libpayload. Signed-off-by: Ronald G. Minnich <rminnich(a)gmail.com> Change-Id: I1e0b2af4a3aaf314b5cdd8a46ec2cb2663ee684e Signed-off-by: Ronald G. Minnich <rminnich(a)gmail.com> --- payloads/libpayload/include/armv7/arch/io.h | 10 ++++++++++ payloads/libpayload/include/libpayload.h | 5 +++++ payloads/libpayload/libc/time.c | 19 +++++++++++++------ 3 files changed, 28 insertions(+), 6 deletions(-) diff --git a/payloads/libpayload/include/armv7/arch/io.h b/payloads/libpayload/include/armv7/arch/io.h index e71e1dd..6f4c621 100644 --- a/payloads/libpayload/include/armv7/arch/io.h +++ b/payloads/libpayload/include/armv7/arch/io.h @@ -31,12 +31,22 @@ #ifndef _ARCH_IO_H #define _ARCH_IO_H +/* x86 has to differentiate between inb/readb. + * No such issue on arm, but we still need to define both + * types of operations. + */ #define readb(_a) (*(volatile unsigned char *) (_a)) #define readw(_a) (*(volatile unsigned short *) (_a)) #define readl(_a) (*(volatile unsigned long *) (_a)) +#define inb(_a) (*(volatile unsigned char *) (_a)) +#define inw(_a) (*(volatile unsigned short *) (_a)) +#define inl(_a) (*(volatile unsigned long *) (_a)) #define writeb(_v, _a) (*(volatile unsigned char *) (_a) = (_v)) #define writew(_v, _a) (*(volatile unsigned short *) (_a) = (_v)) #define writel(_v, _a) (*(volatile unsigned long *) (_a) = (_v)) +#define outb(_v, _a) (*(volatile unsigned char *) (_a) = (_v)) +#define outw(_v, _a) (*(volatile unsigned short *) (_a) = (_v)) +#define outl(_v, _a) (*(volatile unsigned long *) (_a) = (_v)) #endif diff --git a/payloads/libpayload/include/libpayload.h b/payloads/libpayload/include/libpayload.h index eaa0d0d..d1b9de8 100644 --- a/payloads/libpayload/include/libpayload.h +++ b/payloads/libpayload/include/libpayload.h @@ -294,6 +294,11 @@ long long int llabs(long long int j); u8 bin2hex(u8 b); u8 hex2bin(u8 h); void fatal(const char *msg) __attribute__ ((noreturn)); + +void *default_memset(void *s, int c, size_t n); +void *default_memcpy(void *dst, const void *src, size_t n); +void *default_memmove(void *dst, const void *src, size_t n); +int default_memcmp(const void *s1, const void *s2, size_t len); /** @} */ 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. *

1 0

← Newer
1
...
33
34
35
36
37
38
39
...
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