From 48a0dd2f45b7af6756af8a84b10c39d1a896f25a Mon Sep 17 00:00:00 2001 From: Iru Cai Date: Wed, 30 Oct 2019 15:21:41 +0800 Subject: kill some stdio function decl --- include/bootcount.h | 138 ----------------- include/configs/tam3517-common.h | 326 --------------------------------------- include/efi_selftest.h | 137 ---------------- include/stdio.h | 15 -- 4 files changed, 616 deletions(-) delete mode 100644 include/bootcount.h delete mode 100644 include/configs/tam3517-common.h delete mode 100644 include/efi_selftest.h (limited to 'include') diff --git a/include/bootcount.h b/include/bootcount.h deleted file mode 100644 index 8fa8cf8..0000000 --- a/include/bootcount.h +++ /dev/null @@ -1,138 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* - * (C) Copyright 2012 - * Stefan Roese, DENX Software Engineering, sr@denx.de. - */ -#ifndef _BOOTCOUNT_H__ -#define _BOOTCOUNT_H__ - -#include -#include -#include -#include - -#ifdef CONFIG_DM_BOOTCOUNT - -struct bootcount_ops { - /** - * get() - get the current bootcount value - * - * Returns the current counter value of the bootcount backing - * store. - * - * @dev: Device to read from - * @bootcount: Address to put the current bootcount value - */ - int (*get)(struct udevice *dev, u32 *bootcount); - - /** - * set() - set a bootcount value (e.g. to reset or increment) - * - * Sets the value in the bootcount backing store. - * - * @dev: Device to read from - * @bootcount: New bootcount value to store - */ - int (*set)(struct udevice *dev, const u32 bootcount); -}; - -/* Access the operations for a bootcount device */ -#define bootcount_get_ops(dev) ((struct bootcount_ops *)(dev)->driver->ops) - -/** - * dm_bootcount_get() - Read the current value from a bootcount storage - * - * @dev: Device to read from - * @bootcount: Place to put the current bootcount - * @return 0 if OK, -ve on error - */ -int dm_bootcount_get(struct udevice *dev, u32 *bootcount); - -/** - * dm_bootcount_set() - Write a value to a bootcount storage - * - * @dev: Device to read from - * @bootcount: Value to be written to the backing storage - * @return 0 if OK, -ve on error - */ -int dm_bootcount_set(struct udevice *dev, u32 bootcount); - -#endif - -#if defined(CONFIG_SPL_BOOTCOUNT_LIMIT) || defined(CONFIG_BOOTCOUNT_LIMIT) - -#if !defined(CONFIG_SYS_BOOTCOUNT_LE) && !defined(CONFIG_SYS_BOOTCOUNT_BE) -# if __BYTE_ORDER == __LITTLE_ENDIAN -# define CONFIG_SYS_BOOTCOUNT_LE -# else -# define CONFIG_SYS_BOOTCOUNT_BE -# endif -#endif - -#ifdef CONFIG_SYS_BOOTCOUNT_LE -static inline void raw_bootcount_store(volatile u32 *addr, u32 data) -{ - out_le32(addr, data); -} - -static inline u32 raw_bootcount_load(volatile u32 *addr) -{ - return in_le32(addr); -} -#else -static inline void raw_bootcount_store(volatile u32 *addr, u32 data) -{ - out_be32(addr, data); -} - -static inline u32 raw_bootcount_load(volatile u32 *addr) -{ - return in_be32(addr); -} -#endif - -DECLARE_GLOBAL_DATA_PTR; -static inline int bootcount_error(void) -{ - unsigned long bootcount = bootcount_load(); - unsigned long bootlimit = env_get_ulong("bootlimit", 10, 0); - - if (bootlimit && bootcount > bootlimit) { - printf("Warning: Bootlimit (%lu) exceeded.", bootlimit); - if (!(gd->flags & GD_FLG_SPL_INIT)) - printf(" Using altbootcmd."); - printf("\n"); - - return 1; - } - - return 0; -} - -static inline void bootcount_inc(void) -{ - unsigned long bootcount = bootcount_load(); - - if (gd->flags & GD_FLG_SPL_INIT) { - bootcount_store(++bootcount); - return; - } - -#ifndef CONFIG_SPL_BUILD - /* Only increment bootcount when no bootcount support in SPL */ -#ifndef CONFIG_SPL_BOOTCOUNT_LIMIT - bootcount_store(++bootcount); -#endif - env_set_ulong("bootcount", bootcount); -#endif /* !CONFIG_SPL_BUILD */ -} - -#if defined(CONFIG_SPL_BUILD) && !defined(CONFIG_SPL_BOOTCOUNT_LIMIT) -void bootcount_store(ulong a) {}; -ulong bootcount_load(void) { return 0; } -#endif /* CONFIG_SPL_BUILD && !CONFIG_SPL_BOOTCOUNT_LIMIT */ -#else -static inline int bootcount_error(void) { return 0; } -static inline void bootcount_inc(void) {} -#endif /* CONFIG_SPL_BOOTCOUNT_LIMIT || CONFIG_BOOTCOUNT_LIMIT */ -#endif /* _BOOTCOUNT_H__ */ diff --git a/include/configs/tam3517-common.h b/include/configs/tam3517-common.h deleted file mode 100644 index 121de2b..0000000 --- a/include/configs/tam3517-common.h +++ /dev/null @@ -1,326 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* - * Copyright (C) 2011 - * Stefano Babic, DENX Software Engineering, sbabic@denx.de. - * - * Copyright (C) 2009 TechNexion Ltd. - */ - -#ifndef __TAM3517_H -#define __TAM3517_H - -/* - * High Level Configuration Options - */ - -#include /* get chip and board defs */ -#include - -/* Clock Defines */ -#define V_OSCK 26000000 /* Clock output from T2 */ -#define V_SCLK (V_OSCK >> 1) - -#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG -#define CONFIG_REVISION_TAG - -/* - * Size of malloc() pool - */ -#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (128 << 10) + \ - 2 * 1024 * 1024) -/* - * DDR related - */ -#define CONFIG_SYS_CS0_SIZE (256 * 1024 * 1024) - -/* - * Hardware drivers - */ - -/* - * NS16550 Configuration - */ -#define CONFIG_SYS_NS16550_SERIAL -#define CONFIG_SYS_NS16550_REG_SIZE (-4) -#define CONFIG_SYS_NS16550_CLK 48000000 /* 48MHz (APLL96/2) */ - -/* - * select serial console configuration - */ -#define CONFIG_SYS_NS16550_COM1 OMAP34XX_UART1 - -/* allow to overwrite serial and ethaddr */ -#define CONFIG_ENV_OVERWRITE -#define CONFIG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600,\ - 115200} -/* EHCI */ -#define CONFIG_OMAP_EHCI_PHY1_RESET_GPIO 25 - -#define CONFIG_SYS_I2C -#define CONFIG_SYS_I2C_EEPROM_ADDR 0x50 /* base address */ -#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1 /* bytes of address */ -#define CONFIG_SYS_I2C_EEPROM_ADDR_OVERFLOW 0x07 - -/* - * Board NAND Info. - */ -#define CONFIG_SYS_NAND_BASE NAND_BASE /* physical address */ - /* to access */ - /* nand at CS0 */ - -#define CONFIG_SYS_MAX_NAND_DEVICE 1 /* Max number of */ - /* NAND devices */ - -/* - * Miscellaneous configurable options - */ -#define CONFIG_SYS_CBSIZE 512 /* Console I/O Buffer Size */ - -#define CONFIG_SYS_MAXARGS 32 /* max number of command */ - /* args */ -/* memtest works on */ -#define CONFIG_SYS_MEMTEST_START (OMAP34XX_SDRC_CS0) -#define CONFIG_SYS_MEMTEST_END (OMAP34XX_SDRC_CS0 + \ - 0x01F00000) /* 31MB */ - -#define CONFIG_SYS_LOAD_ADDR (OMAP34XX_SDRC_CS0) /* default load */ - /* address */ - -/* - * AM3517 has 12 GP timers, they can be driven by the system clock - * (12/13/16.8/19.2/38.4MHz) or by 32KHz clock. We use 13MHz (V_SCLK). - * This rate is divided by a local divisor. - */ -#define CONFIG_SYS_TIMERBASE OMAP34XX_GPT2 -#define CONFIG_SYS_PTV 2 /* Divisor: 2^(PTV+1) => 8 */ - -/* - * Physical Memory Map - */ -#define PHYS_SDRAM_1 OMAP34XX_SDRC_CS0 -#define PHYS_SDRAM_2 OMAP34XX_SDRC_CS1 - -/* - * FLASH and environment organization - */ - -/* **** PISMO SUPPORT *** */ - -/* Redundant Environment */ -#define CONFIG_SYS_ENV_SECT_SIZE (128 << 10) /* 128 KiB */ -#define CONFIG_ENV_OFFSET 0x180000 -#define CONFIG_ENV_ADDR 0x180000 -#define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET + \ - 2 * CONFIG_SYS_ENV_SECT_SIZE) -#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE - -#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1 -#define CONFIG_SYS_INIT_RAM_ADDR 0x4020f800 -#define CONFIG_SYS_INIT_RAM_SIZE 0x800 -#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_INIT_RAM_ADDR + \ - CONFIG_SYS_INIT_RAM_SIZE - \ - GENERATED_GBL_DATA_SIZE) - -/* - * ethernet support, EMAC - * - */ -#define CONFIG_DRIVER_TI_EMAC_USE_RMII -#define CONFIG_BOOTP_DNS2 -#define CONFIG_BOOTP_SEND_HOSTNAME -#define CONFIG_NET_RETRY_COUNT 10 - -/* Defines for SPL */ -#define CONFIG_SPL_CONSOLE -#define CONFIG_SPL_NAND_SOFTECC -#define CONFIG_SPL_NAND_WORKSPACE 0x8f07f000 /* below BSS */ - -#define CONFIG_SPL_NAND_BASE -#define CONFIG_SPL_NAND_DRIVERS -#define CONFIG_SPL_NAND_ECC - -#define CONFIG_SPL_MAX_SIZE (SRAM_SCRATCH_SPACE_ADDR - \ - CONFIG_SPL_TEXT_BASE) -#define CONFIG_SPL_STACK LOW_LEVEL_SRAM_STACK - -#define CONFIG_SYS_SPL_MALLOC_START 0x8f000000 -#define CONFIG_SYS_SPL_MALLOC_SIZE 0x80000 -#define CONFIG_SPL_BSS_START_ADDR 0x8f080000 /* end of RAM */ -#define CONFIG_SPL_BSS_MAX_SIZE 0x80000 - -#define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1 -#define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img" - -/* FAT */ -#define CONFIG_SPL_FS_LOAD_KERNEL_NAME "uImage" -#define CONFIG_SPL_FS_LOAD_ARGS_NAME "args" - -/* RAW SD card / eMMC */ -#define CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR 0x900 /* address 0x120000 */ -#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR 0x80 /* address 0x10000 */ -#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS 0x80 /* 64KiB */ - -/* NAND boot config */ -#define CONFIG_SYS_NAND_PAGE_COUNT 64 -#define CONFIG_SYS_NAND_PAGE_SIZE 2048 -#define CONFIG_SYS_NAND_OOBSIZE 64 -#define CONFIG_SYS_NAND_BLOCK_SIZE (128 * 1024) -#define CONFIG_SYS_NAND_5_ADDR_CYCLE -#define CONFIG_SYS_NAND_BAD_BLOCK_POS 0 -#define CONFIG_SYS_NAND_ECCPOS {40, 41, 42, 43, 44, 45, 46, 47,\ - 48, 49, 50, 51, 52, 53, 54, 55,\ - 56, 57, 58, 59, 60, 61, 62, 63} -#define CONFIG_SYS_NAND_ECCSIZE 256 -#define CONFIG_SYS_NAND_ECCBYTES 3 -#define CONFIG_NAND_OMAP_ECCSCHEME OMAP_ECC_HAM1_CODE_SW - -#define CONFIG_SYS_NAND_U_BOOT_START CONFIG_SYS_TEXT_BASE - -#define CONFIG_SYS_NAND_U_BOOT_OFFS 0x80000 -#define CONFIG_SYS_NAND_U_BOOT_SIZE 0x80000 - -/* Setup MTD for NAND on the SOM */ - -#define CONFIG_TAM3517_SETTINGS \ - "netdev=eth0\0" \ - "nandargs=setenv bootargs root=${nandroot} " \ - "rootfstype=${nandrootfstype}\0" \ - "nfsargs=setenv bootargs root=/dev/nfs rw " \ - "nfsroot=${serverip}:${rootpath}\0" \ - "ramargs=setenv bootargs root=/dev/ram rw\0" \ - "addip_sta=setenv bootargs ${bootargs} " \ - "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}" \ - ":${hostname}:${netdev}:off panic=1\0" \ - "addip_dyn=setenv bootargs ${bootargs} ip=dhcp\0" \ - "addip=if test -n ${ipdyn};then run addip_dyn;" \ - "else run addip_sta;fi\0" \ - "addmtd=setenv bootargs ${bootargs} ${mtdparts}\0" \ - "addtty=setenv bootargs ${bootargs}" \ - " console=ttyO0,${baudrate}\0" \ - "addmisc=setenv bootargs ${bootargs} ${misc}\0" \ - "loadaddr=82000000\0" \ - "kernel_addr_r=82000000\0" \ - "hostname=" CONFIG_HOSTNAME "\0" \ - "bootfile=" CONFIG_HOSTNAME "/uImage\0" \ - "flash_self=run ramargs addip addtty addmtd addmisc;" \ - "bootm ${kernel_addr} ${ramdisk_addr}\0" \ - "flash_nfs=run nfsargs addip addtty addmtd addmisc;" \ - "bootm ${kernel_addr}\0" \ - "nandboot=run nandargs addip addtty addmtd addmisc;" \ - "nand read ${kernel_addr_r} kernel\0" \ - "bootm ${kernel_addr_r}\0" \ - "net_nfs=tftp ${kernel_addr_r} ${bootfile}; " \ - "run nfsargs addip addtty addmtd addmisc;" \ - "bootm ${kernel_addr_r}\0" \ - "net_self=if run net_self_load;then " \ - "run ramargs addip addtty addmtd addmisc;" \ - "bootm ${kernel_addr_r} ${ramdisk_addr_r};" \ - "else echo Images not loades;fi\0" \ - "u-boot=" CONFIG_HOSTNAME "/u-boot.img\0" \ - "load=tftp ${loadaddr} ${u-boot}\0" \ - "loadmlo=tftp ${loadaddr} ${mlo}\0" \ - "mlo=" CONFIG_HOSTNAME "/MLO\0" \ - "uboot_addr=0x80000\0" \ - "update=nandecc sw;nand erase ${uboot_addr} 100000;" \ - "nand write ${loadaddr} ${uboot_addr} 80000\0" \ - "updatemlo=nandecc hw;nand erase 0 20000;" \ - "nand write ${loadaddr} 0 20000\0" \ - "upd=if run load;then echo Updating u-boot;if run update;" \ - "then echo U-Boot updated;" \ - "else echo Error updating u-boot !;" \ - "echo Board without bootloader !!;" \ - "fi;" \ - "else echo U-Boot not downloaded..exiting;fi\0" \ - -/* - * this is common code for all TAM3517 boards. - * MAC address is stored from manufacturer in - * I2C EEPROM - */ -#if !(defined(__KERNEL_STRICT_NAMES) || defined(__ASSEMBLY__)) -/* - * The I2C EEPROM on the TAM3517 contains - * mac address and production data - */ -struct tam3517_module_info { - char customer[48]; - char product[48]; - - /* - * bit 0~47 : sequence number - * bit 48~55 : week of year, from 0. - * bit 56~63 : year - */ - unsigned long long sequence_number; - - /* - * bit 0~7 : revision fixed - * bit 8~15 : revision major - * bit 16~31 : TNxxx - */ - unsigned int revision; - unsigned char eth_addr[4][8]; - unsigned char _rev[100]; -}; - -#define TAM3517_READ_EEPROM(info, ret) \ -do { \ - i2c_init(CONFIG_SYS_OMAP24_I2C_SPEED, CONFIG_SYS_OMAP24_I2C_SLAVE); \ - if (eeprom_read(CONFIG_SYS_I2C_EEPROM_ADDR, 0, \ - (void *)info, sizeof(*info))) \ - ret = 1; \ - else \ - ret = 0; \ -} while (0) - -#define TAM3517_READ_MAC_FROM_EEPROM(info) \ -do { \ - char buf[80], ethname[20]; \ - int i; \ - memset(buf, 0, sizeof(buf)); \ - for (i = 0 ; i < ARRAY_SIZE((info)->eth_addr); i++) { \ - sprintf(buf, "%02X:%02X:%02X:%02X:%02X:%02X", \ - (info)->eth_addr[i][5], \ - (info)->eth_addr[i][4], \ - (info)->eth_addr[i][3], \ - (info)->eth_addr[i][2], \ - (info)->eth_addr[i][1], \ - (info)->eth_addr[i][0]); \ - \ - if (i) \ - sprintf(ethname, "eth%daddr", i); \ - else \ - strcpy(ethname, "ethaddr"); \ - printf("Setting %s from EEPROM with %s\n", ethname, buf);\ - env_set(ethname, buf); \ - } \ -} while (0) - -/* The following macros are taken from Technexion's documentation */ -#define TAM3517_sequence_number(info) \ - ((info)->sequence_number % 0x1000000000000LL) -#define TAM3517_week_of_year(info) (((info)->sequence_number >> 48) % 0x100) -#define TAM3517_year(info) ((info)->sequence_number >> 56) -#define TAM3517_revision_fixed(info) ((info)->revision % 0x100) -#define TAM3517_revision_major(info) (((info)->revision >> 8) % 0x100) -#define TAM3517_revision_tn(info) ((info)->revision >> 16) - -#define TAM3517_PRINT_SOM_INFO(info) \ -do { \ - printf("Vendor:%s\n", (info)->customer); \ - printf("SOM: %s\n", (info)->product); \ - printf("SeqNr: %02llu%02llu%012llu\n", \ - TAM3517_year(info), \ - TAM3517_week_of_year(info), \ - TAM3517_sequence_number(info)); \ - printf("Rev: TN%u %u.%u\n", \ - TAM3517_revision_tn(info), \ - TAM3517_revision_major(info), \ - TAM3517_revision_fixed(info)); \ -} while (0) - -#endif - -#endif /* __TAM3517_H */ diff --git a/include/efi_selftest.h b/include/efi_selftest.h deleted file mode 100644 index eaee188..0000000 --- a/include/efi_selftest.h +++ /dev/null @@ -1,137 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* - * EFI application loader - * - * Copyright (c) 2017 Heinrich Schuchardt - */ - -#ifndef _EFI_SELFTEST_H -#define _EFI_SELFTEST_H - -#include -#include -#include -#include -#include - -#define EFI_ST_SUCCESS 0 -#define EFI_ST_FAILURE 1 -#define EFI_ST_SUCCESS_STR L"SUCCESS" -/* - * Prints a message. - */ -#define efi_st_printf(...) \ - (efi_st_printc(-1, __VA_ARGS__)) - -/* - * Prints an error message. - * - * @... format string followed by fields to print - */ -#define efi_st_error(...) \ - (efi_st_printc(EFI_LIGHTRED, "%s(%u):\nERROR: ", __FILE__, __LINE__), \ - efi_st_printc(EFI_LIGHTRED, __VA_ARGS__)) - -/* - * Prints a TODO message. - * - * @... format string followed by fields to print - */ -#define efi_st_todo(...) \ - (efi_st_printc(EFI_YELLOW, "%s(%u):\nTODO: ", __FILE__, __LINE__), \ - efi_st_printc(EFI_YELLOW, __VA_ARGS__)) \ - -/* - * A test may be setup and executed at boottime, - * it may be setup at boottime and executed at runtime, - * or it may be setup and executed at runtime. - */ -enum efi_test_phase { - EFI_EXECUTE_BEFORE_BOOTTIME_EXIT = 1, - EFI_SETUP_BEFORE_BOOTTIME_EXIT, - EFI_SETUP_AFTER_BOOTTIME_EXIT, -}; - -extern struct efi_simple_text_output_protocol *con_out; -extern struct efi_simple_text_input_protocol *con_in; - -/* - * Exit the boot services. - * - * The size of the memory map is determined. - * Pool memory is allocated to copy the memory map. - * The memory amp is copied and the map key is obtained. - * The map key is used to exit the boot services. - */ -void efi_st_exit_boot_services(void); - -/* - * Print a colored message - * - * @color color, see constants in efi_api.h, use -1 for no color - * @fmt printf format - * @... arguments to be printed - * on return position of terminating zero word - */ -void efi_st_printc(int color, const char *fmt, ...) - __attribute__ ((format (__printf__, 2, 3))); - -/** - * efi_st_translate_char() - translate a unicode character to a string - * - * @code: unicode character - * Return: string - */ -u16 *efi_st_translate_char(u16 code); - -/** - * efi_st_translate_code() - translate a scan code to a human readable string - * - * @code: unicode character - * Return: string - */ -u16 *efi_st_translate_code(u16 code); - -/* - * Compare an u16 string to a char string. - * - * @buf1: u16 string - * @buf2: char string - * @return: 0 if both buffers contain the same bytes - */ -int efi_st_strcmp_16_8(const u16 *buf1, const char *buf2); - -/* - * Reads an Unicode character from the input device. - * - * @return: Unicode character - */ -u16 efi_st_get_key(void); - -/** - * struct efi_unit_test - EFI unit test - * - * An efi_unit_test provides a interface to an EFI unit test. - * - * @name: name of unit test - * @phase: specifies when setup and execute are executed - * @setup: set up the unit test - * @teardown: tear down the unit test - * @execute: execute the unit test - * @on_request: test is only executed on request - */ -struct efi_unit_test { - const char *name; - const enum efi_test_phase phase; - int (*setup)(const efi_handle_t handle, - const struct efi_system_table *systable); - int (*execute)(void); - int (*teardown)(void); - bool on_request; -}; - -/* Declare a new EFI unit test */ -#define EFI_UNIT_TEST(__name) \ - ll_entry_declare(struct efi_unit_test, __name, efi_unit_test) - -#endif /* _EFI_SELFTEST_H */ diff --git a/include/stdio.h b/include/stdio.h index a18aab0..d5a5928 100644 --- a/include/stdio.h +++ b/include/stdio.h @@ -13,18 +13,9 @@ int tstc(void); (defined(CONFIG_TPL_BUILD) && defined(CONFIG_TPL_SERIAL_SUPPORT)) || \ (defined(CONFIG_SPL_BUILD) && !defined(CONFIG_TPL_BUILD) && \ defined(CONFIG_SPL_SERIAL_SUPPORT)) -void putc(const char c); -void puts(const char *s); int __printf(1, 2) printf(const char *fmt, ...); int vprintf(const char *fmt, va_list args); #else -static inline void putc(const char c) -{ -} - -static inline void puts(const char *s) -{ -} static inline int __printf(1, 2) printf(const char *fmt, ...) { @@ -45,10 +36,4 @@ static inline int vprintf(const char *fmt, va_list args) #define stderr 2 #define MAX_FILES 3 -int __printf(2, 3) fprintf(int file, const char *fmt, ...); -void fputs(int file, const char *s); -void fputc(int file, const char c); -int ftstc(int file); -int fgetc(int file); - #endif /* __STDIO_H */ -- cgit v1.2.3