September 2008 - U-Boot

[U-Boot] [PATCH v2] Support for multiple SGMII/TBI interfaces for TSEC ethernet
by Peter Tyser 09 Sep '08

09 Sep '08

Fix TBI PHY accesses to use the proper offset in CPU register space. The previous code would incorrectly access the TBI PHY by reading/writing to CPU register space at the same location as would be used to access external PHYs. Signed-off-by: Peter Tyser <ptyser(a)xes-inc.com> --- I replaced the hardcoding of CFG_TBIPA_VALUE in the tsec_configure_serdes() to support possible changes of the TBI addressing down the road, but kept the default TBI PHY address at CFG_TBIPA_VALUE as Andy Flemming suggested. drivers/net/tsec.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/net/tsec.c b/drivers/net/tsec.c index f81211a..43e5dff 100644 --- a/drivers/net/tsec.c +++ b/drivers/net/tsec.c @@ -283,11 +283,13 @@ uint tsec_local_mdio_read(volatile tsec_t *phyregs, uint phyid, uint regnum) /* Configure the TBI for SGMII operation */ static void tsec_configure_serdes(struct tsec_private *priv) { - tsec_local_mdio_write(priv->phyregs, CFG_TBIPA_VALUE, TBI_ANA, + /* Access TBI PHY registers at given TSEC register offset as opposed to the + * register offset used for external PHY accesses */ + tsec_local_mdio_write(priv->regs, priv->regs->tbipa, TBI_ANA, TBIANA_SETTINGS); - tsec_local_mdio_write(priv->phyregs, CFG_TBIPA_VALUE, TBI_TBICON, + tsec_local_mdio_write(priv->regs, priv->regs->tbipa, TBI_TBICON, TBICON_CLK_SELECT); - tsec_local_mdio_write(priv->phyregs, CFG_TBIPA_VALUE, TBI_CR, + tsec_local_mdio_write(priv->regs, priv->regs->tbipa, TBI_CR, TBICR_SETTINGS); } @@ -304,7 +306,6 @@ static int init_phy(struct eth_device *dev) /* Assign a Physical address to the TBI */ regs->tbipa = CFG_TBIPA_VALUE; - phyregs->tbipa = CFG_TBIPA_VALUE; asm("sync"); /* Reset MII (due to new addresses) */ -- 1.5.4.3

1 0

[U-Boot] [PATCH] Correct drv_usb_kbd_init function
by Ryan CHEN 09 Sep '08

09 Sep '08

The patch is that check if usb_get_dev_index() function return valid pointer. If valid, continue. Otherwise return -1. Signed-off-by: Ryan Chen <ryan.chen(a)st.com> --- common/usb_kbd.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/common/usb_kbd.c b/common/usb_kbd.c index c876495..880e616 100644 --- a/common/usb_kbd.c +++ b/common/usb_kbd.c @@ -164,6 +164,8 @@ int drv_usb_kbd_init(void) /* scan all USB Devices */ for(i=0;i<USB_MAX_DEVICE;i++) { dev=usb_get_dev_index(i); /* get device */ + if(dev == NULL) + return -1; if(dev->devnum!=-1) { if(usb_kbd_probe(dev,0)==1) { /* Ok, we found a keyboard */ /* check, if it is already registered */ -- 1.6.0.rc1

3 3

Re: [U-Boot] [PATCH 2/3] fix checkpatch errors
by Hugo Villeneuve 09 Sep '08

09 Sep '08

git diff ${GITDIFF_OPTS} ${commit} >> ${patch}.patchu-boot-bounces(a)lists.denx.de wrote: > Dear Georg Schardt, > > In message <48C3B358.6010500(a)team-ctech.de> you wrote: >> >> - create my own testing branch: "git branch testing" >> - switch to this branch: "git checkout testing" >> - copy/modify files >> - add the new files with "git add board/xilinx/fx12mm/" >> - commit the changes with "git commit -a" >> - create a patch with "git format-patch origin" >> - check this patch with checkpatch.pl >> - fix the errors, commit again, create patch again get 2 patchfiles I´m not an expert with GIT, but I would suggest the following change to avoid unnecessary commits: 1. Create my own testing branch: "git branch testing" 2. Switch to this branch: "git checkout testing" 3. Copy/modify files 4. Create temporary patch from local changes: "git diff > temporary.patch" 5. Check this patch with checkpatch.pl 6. If errors found: go back to step 3, else go to step 7 7. Add the new/modified files with "git add board/xilinx/fx12mm/" 8. Commit the changes with "git commit -a" 9. Create a patch with "git format-patch origin" 10. Check this patch with checkpatch.pl Hugo V. Hugo Villeneuve Hardware developer | Concepteur matériel Lyrtech Phone/Tél. : (1) (418) 877-4644 #2395 Toll-free/Sans frais - Canada & USA : (1) (888) 922-4644 #2395 Fax/Téléc. : (1) (418) 877-7710 www.lyrtech.com Infinite possibilities...TM

1 0

[U-Boot] [patch 0/1] fix hangup during boot when USB is used.
by Remy Bohmer 09 Sep '08

09 Sep '08

A recent commit (936897d4d1365452bbbdf8430db5e7769ef08d38) enabled the usb_stop() command in common/cmd_bootm.c which was not enabled for some time, because no board did actually set the CFG_CMD_USB flag. So, now the usb_stop() is executed before loading the linux kernel, which will result in a hangup during boot when USB has been started and stopped already (on AT91SAM). --

3 4

[U-Boot] [PATCH] Makefile: fix bug introduced by commit 47ffd6c2
by Wolfgang Denk 09 Sep '08

09 Sep '08

--- common/Makefile | 2 +- drivers/rtc/Makefile | 2 +- drivers/serial/Makefile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/common/Makefile b/common/Makefile index d3888d6..8d4a426 100644 --- a/common/Makefile +++ b/common/Makefile @@ -153,7 +153,7 @@ COBJS-$(CONFIG_LYNXKDI) += lynxkdi.o COBJS-$(CONFIG_USB_KEYBOARD) += usb_kbd.o COBJS-$(CONFIG_DDR_SPD) += ddr_spd.o -COBJS := $(sort COBJS-y) +COBJS := $(sort $(COBJS-y)) SRCS := $(AOBJS:.o=.S) $(COBJS:.o=.c) OBJS := $(addprefix $(obj),$(AOBJS) $(COBJS)) diff --git a/drivers/rtc/Makefile b/drivers/rtc/Makefile index 7f817dc..94bc518 100644 --- a/drivers/rtc/Makefile +++ b/drivers/rtc/Makefile @@ -59,7 +59,7 @@ COBJS-$(CONFIG_RTC_RX8025) += rx8025.o COBJS-$(CONFIG_RTC_S3C24X0) += s3c24x0_rtc.o COBJS-$(CONFIG_RTC_X1205) += x1205.o -COBJS := $(sort COBJS-y) +COBJS := $(sort $(COBJS-y)) SRCS := $(COBJS:.o=.c) OBJS := $(addprefix $(obj),$(COBJS)) diff --git a/drivers/serial/Makefile b/drivers/serial/Makefile index adb0a58..eafe543 100644 --- a/drivers/serial/Makefile +++ b/drivers/serial/Makefile @@ -39,7 +39,7 @@ COBJS-$(CONFIG_XILINX_UARTLITE) += serial_xuartlite.o COBJS-$(CONFIG_SCIF_CONSOLE) += serial_sh.o COBJS-$(CONFIG_USB_TTY) += usbtty.o -COBJS := $(sort COBJS-y) +COBJS := $(sort $(COBJS-y)) SRCS := $(COBJS:.o=.c) OBJS := $(addprefix $(obj),$(COBJS)) -- 1.5.6.1

1 0

[U-Boot] Fix dev_print for when it is called from usb_stor_info (usb storage command)
by Nícolas Carneiro Lebedenco 09 Sep '08

09 Sep '08

Hello people, here is a quick fix for the output of the command usb storage. It was printing "Device 0: not available" because the IF_TYPE_USB was not included into the switch statement. --- u-boot-1.3.4.original/disk/part.c 2008-08-12 11:08:38.000000000 -0300 +++ u-boot-1.3.4/disk/part.c 2008-09-04 14:48:55.000000000 -0300 @@ -124,6 +124,12 @@ void dev_print (block_dev_desc_t *dev_de dev_desc->revision, dev_desc->product); break; + case IF_TYPE_USB: + printf ("Vendor: %s Rev: %s Prod: %s\n", + dev_desc->vendor, + dev_desc->revision, + dev_desc->product); + break; case IF_TYPE_UNKNOWN: default: puts ("not available\n"); -- Now, for example, with my usb kingston datatraveller, it correctly prints: U-Boot> usb storage Device 0: Vendor: Kingston Rev: 1.00 Prod: DataTraveler 2.0 Type: Removable Hard Disk Capacity: 1956.5 MB = 1.9 GB (4006912 x 512) Regards, Nícolas

3 5

[U-Boot] [PATCH] ppc4xx: ppc440-generic-ALL: Fix out of tree build
by Ricardo Ribalda Delgado 09 Sep '08

09 Sep '08

This patch solves the problems compiling ml507, v5fx30teval and ppc440-generic out of tree. Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda(a)uam.es> --- Makefile | 49 +++++++++++++++++++++++----------- board/xilinx/ppc440-generic/Makefile | 4 +- 2 files changed, 35 insertions(+), 18 deletions(-) diff --git a/Makefile b/Makefile index a342a88..c5ec313 100644 --- a/Makefile +++ b/Makefile @@ -1359,17 +1359,21 @@ ml300_config: unconfig @$(MKCONFIG) $(@:_config=) ppc ppc4xx ml300 xilinx ml507_flash_config: unconfig + @mkdir -p $(obj)include $(obj)board/xilinx/ppc440-generic @mkdir -p $(obj)include $(obj)board/xilinx/ml507 - @echo "LDSCRIPT := $(obj)board/xilinx/ppc440-generic/u-boot-rom.lds" \ - > $(obj)board/xilinx/ml507/config.mk - @echo "TEXT_BASE := 0xFE360000" >> $(obj)board/xilinx/ml507/config.mk + @echo "LDSCRIPT:=$(SRCTREE)/board/xilinx/ppc440-generic/u-boot-rom.lds"\ + > $(SRCTREE)/board/xilinx/ml507/config.mk + @echo "TEXT_BASE := 0xFE360000" \ + >> $(SRCTREE)/board/xilinx/ml507/config.mk @$(MKCONFIG) ml507 ppc ppc4xx ml507 xilinx ml507_config: unconfig + @mkdir -p $(obj)include $(obj)board/xilinx/ppc440-generic @mkdir -p $(obj)include $(obj)board/xilinx/ml507 - @echo "LDSCRIPT := $(obj)board/xilinx/ppc440-generic/u-boot-ram.lds" \ - > $(obj)board/xilinx/ml507/config.mk - @echo "TEXT_BASE := 0x04000000" >> $(obj)board/xilinx/ml507/config.mk + @echo "LDSCRIPT:=$(SRCTREE)/board/xilinx/ppc440-generic/u-boot-ram.lds"\ + > $(SRCTREE)/board/xilinx/ml507/config.mk + @echo "TEXT_BASE := 0x04000000" \ + >> $(SRCTREE)/board/xilinx/ml507/config.mk @$(MKCONFIG) ml507 ppc ppc4xx ml507 xilinx ocotea_config: unconfig @@ -1467,15 +1471,21 @@ taishan_config: unconfig @$(MKCONFIG) $(@:_config=) ppc ppc4xx taishan amcc v5fx30teval_config: unconfig + @mkdir -p $(obj)include $(obj)board/xilinx/ppc440-generic @mkdir -p $(obj)include $(obj)board/avnet/v5fx30teval - @echo "LDSCRIPT := $(obj)board/xilinx/ppc440-generic/u-boot-ram.lds" > $(obj)board/avnet/v5fx30teval/config.mk - @echo "TEXT_BASE := 0x03000000" >> $(obj)board/avnet/v5fx30teval/config.mk + @echo "LDSCRIPT:=$(SRCTREE)/board/xilinx/ppc440-generic/u-boot-ram.lds"\ + > $(SRCTREE)/board/avnet/v5fx30teval/config.mk + @echo "TEXT_BASE := 0x03000000" \ + >> $(SRCTREE)/board/avnet/v5fx30teval/config.mk @$(MKCONFIG) v5fx30teval ppc ppc4xx v5fx30teval avnet v5fx30teval_flash_config: unconfig + @mkdir -p $(obj)include $(obj)board/xilinx/ppc440-generic @mkdir -p $(obj)include $(obj)board/avnet/v5fx30teval - @echo "LDSCRIPT := $(obj)board/xilinx/ppc440-generic/u-boot-rom.lds" > $(obj)board/avnet/v5fx30teval/config.mk - @echo "TEXT_BASE := 0xFF1C0000" >> $(obj)board/avnet/v5fx30teval/config.mk + @echo "LDSCRIPT:=$(SRCTREE)/board/xilinx/ppc440-generic/u-boot-rom.lds"\ + > $(SRCTREE)/board/avnet/v5fx30teval/config.mk + @echo "TEXT_BASE := 0xFF1C0000" \ + >> $(SRCTREE)/board/avnet/v5fx30teval/config.mk @$(MKCONFIG) v5fx30teval ppc ppc4xx v5fx30teval avnet VOH405_config: unconfig @@ -1497,15 +1507,19 @@ WUH405_config: unconfig @$(MKCONFIG) $(@:_config=) ppc ppc4xx wuh405 esd xilinx-ppc440-generic_flash_config: unconfig - @mkdir -p $(obj)include $(obj)board/xilinx/ppc440-generic/ - @echo "LDSCRIPT := $(obj)board/xilinx/ppc440-generic/u-boot-rom.lds" > $(obj)board/xilinx/ppc440-generic/config.mk - @echo "TEXT_BASE := 0xFE360000" >> $(obj)board/xilinx/ppc440-generic/config.mk + @mkdir -p $(obj)include $(obj)board/xilinx/ppc440-generic + @echo "LDSCRIPT:=$(SRCTREE)/board/xilinx/ppc440-generic/u-boot-rom.lds"\ + > $(SRCTREE)/board/xilinx/ppc440-generic/config.mk + @echo "TEXT_BASE := 0xFE360000" \ + >> $(SRCTREE)/board/xilinx/ppc440-generic/config.mk @$(MKCONFIG) xilinx-ppc440-generic ppc ppc4xx ppc440-generic xilinx xilinx-ppc440-generic_config: unconfig - @mkdir -p $(obj)include $(obj)board/xilinx/ppc440-generic/ - @echo "LDSCRIPT := $(obj)board/xilinx/ppc440-generic/u-boot-ram.lds" > $(obj)board/xilinx/ppc440-generic/config.mk - @echo "TEXT_BASE := 0x04000000" >> $(obj)board/xilinx/ppc440-generic/config.mk + @mkdir -p $(obj)include $(obj)board/xilinx/ppc440-generic + @echo "LDSCRIPT:=$(SRCTREE)/board/xilinx/ppc440-generic/u-boot-ram.lds"\ + > $(SRCTREE)/board/xilinx/ppc440-generic/config.mk + @echo "TEXT_BASE := 0x04000000" \ + >> $(SRCTREE)/board/xilinx/ppc440-generic/config.mk @$(MKCONFIG) xilinx-ppc440-generic ppc ppc4xx ppc440-generic xilinx XPEDITE1K_config: unconfig @@ -3176,6 +3190,9 @@ clean: $(obj)board/trab/trab_fkt $(obj)board/voiceblue/eeprom \ $(obj)board/{integratorap,integratorcp}/u-boot.lds \ $(obj)board/{bf533-ezkit,bf533-stamp,bf537-stamp,bf561-ezkit}/u-boot.lds \ + $(SRCTREE)/board/xilinx/ml507/config.mk \ + $(SRCTREE)/board/xilinx/ppc440-generic/config.mk \ + $(SRCTREE)/board/avnet/v5fx30teval/config.mk \ $(obj)cpu/blackfin/bootrom-asm-offsets.[chs] @rm -f $(obj)include/bmp_logo.h @rm -f $(obj)nand_spl/{u-boot-spl,u-boot-spl.map,System.map} diff --git a/board/xilinx/ppc440-generic/Makefile b/board/xilinx/ppc440-generic/Makefile index f7405a8..bf0a6ba 100644 --- a/board/xilinx/ppc440-generic/Makefile +++ b/board/xilinx/ppc440-generic/Makefile @@ -35,9 +35,9 @@ HOST_CFLAGS += $(INCS) LIB = $(obj)lib$(BOARD).a -COBJS += $(SRCTREE)/board/xilinx/ppc440-generic/xilinx_ppc440_generic.o +COBJS += ../../xilinx/ppc440-generic/xilinx_ppc440_generic.o -SOBJS += $(SRCTREE)/board/xilinx/ppc440-generic/init.o +SOBJS += ../../xilinx/ppc440-generic/init.o SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) OBJS := $(addprefix $(obj),$(COBJS)) -- 1.5.6.5

2 2

[U-Boot] FIT: add image hash validation in iminfo command
by Bartlomiej Sieka 09 Sep '08

09 Sep '08

The following two patches extend the iminfo command with the ability to check if hashes in a FIT image are valid.

2 4

[U-Boot] [PATCH] qemu_mips: Update linux bootm to support dynamic cmdline
by Jean-Christophe PLAGNIOL-VILLARD 09 Sep '08

09 Sep '08

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj(a)jcrosoft.com> --- lib_mips/Makefile | 4 ++ lib_mips/bootm_qemu_mips.c | 76 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 80 insertions(+), 0 deletions(-) create mode 100644 lib_mips/bootm_qemu_mips.c diff --git a/lib_mips/Makefile b/lib_mips/Makefile index 8176437..7967e58 100644 --- a/lib_mips/Makefile +++ b/lib_mips/Makefile @@ -28,7 +28,11 @@ LIB = $(obj)lib$(ARCH).a SOBJS-y += COBJS-y += board.o +ifeq ($(CONFIG_QEMU_MIPS),y) +COBJS-y += bootm_qemu_mips.o +else COBJS-y += bootm.o +endif COBJS-y += time.o SRCS := $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c) diff --git a/lib_mips/bootm_qemu_mips.c b/lib_mips/bootm_qemu_mips.c new file mode 100644 index 0000000..cc70fa9 --- /dev/null +++ b/lib_mips/bootm_qemu_mips.c @@ -0,0 +1,76 @@ +/* + * (C) Copyright 2008 + * Jean-Christophe PLAGNIOL-VILLARD <jcplagniol(a)jcrosoft.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 + * + */ + +#include <common.h> +#include <command.h> +#include <image.h> +#include <asm/byteorder.h> +#include <asm/addrspace.h> + +DECLARE_GLOBAL_DATA_PTR; + +int do_bootm_linux(int flag, int argc, char *argv[], bootm_headers_t *images) +{ + void (*theKernel) (int, char **, char **, int *); + char *bootargs = getenv ("bootargs"); + char *start; + uint len; + + /* find kernel entry point */ + theKernel = (void (*)(int, char **, char **, int *))images->ep; + + show_boot_progress (15); + + debug ("## Transferring control to Linux (at address %08lx) ...\n", + (ulong) theKernel); + + gd->bd->bi_boot_params = gd->bd->bi_memstart + (16 << 20) - 256; + debug ("%-12s= 0x%08lX\n", "boot_params", (ulong)gd->bd->bi_boot_params); + + /* set Magic */ + *(int32_t *)(gd->bd->bi_boot_params - 4) = 0x12345678; + /* set ram_size */ + *(int32_t *)(gd->bd->bi_boot_params - 8) = gd->ram_size; + + start = (char*)gd->bd->bi_boot_params; + + len = strlen(bootargs); + + strncpy(start, bootargs, len + 1); + + start += len; + + len = images->rd_end - images->rd_start; + if (len > 0) { + start += sprintf(start," rd_start=0x%08X rd_size=0x%0X", + (uint) UNCACHED_SDRAM (images->rd_start), + (uint) len); + } + + /* we assume that the kernel is in place */ + printf ("\nStarting kernel ...\n\n"); + + theKernel (0, NULL, NULL, 0); + /* does not return */ + return 1; +} -- 1.5.6.5

2 4

[U-Boot] [PATCH v2] Add support for booting of INTEGRITY operating system uImages
by Peter Tyser 09 Sep '08

09 Sep '08

Signed-off-by: Peter Tyser <ptyser(a)xes-inc.com> --- This should be applied after "[PATCH v2] Remove support for booting ARTOS images". README | 5 ++- common/cmd_bootm.c | 38 +++++++++++++++++++++++++++++++++ common/image.c | 3 ++ doc/uImage.FIT/source_file_format.txt | 2 +- include/image.h | 1 + 5 files changed, 46 insertions(+), 3 deletions(-) diff --git a/README b/README index d138c43..f44fb68 100644 --- a/README +++ b/README @@ -3030,8 +3030,9 @@ details; basically, the header defines the following image properties: * Target Operating System (Provisions for OpenBSD, NetBSD, FreeBSD, 4.4BSD, Linux, SVR4, Esix, Solaris, Irix, SCO, Dell, NCR, VxWorks, - LynxOS, pSOS, QNX, RTEMS; - Currently supported: Linux, NetBSD, VxWorks, QNX, RTEMS, LynxOS). + LynxOS, pSOS, QNX, RTEMS, INTEGRITY; + Currently supported: Linux, NetBSD, VxWorks, QNX, RTEMS, LynxOS, + INTEGRITY). * Target CPU Architecture (Provisions for Alpha, ARM, AVR32, Intel x86, IA64, MIPS, NIOS, PowerPC, IBM S390, SuperH, Sparc, Sparc 64 Bit; Currently supported: ARM, AVR32, Intel x86, MIPS, NIOS, PowerPC). diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c index 1880bc3..f7cbc9e 100644 --- a/common/cmd_bootm.c +++ b/common/cmd_bootm.c @@ -108,6 +108,9 @@ static boot_os_fn do_bootm_qnxelf; int do_bootvx (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]); int do_bootelf (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]); #endif +#if defined(CONFIG_INTEGRITY) +static boot_os_fn do_bootm_integrity; +#endif ulong load_addr = CFG_LOAD_ADDR; /* Default Load Address */ static bootm_headers_t images; /* pointers to os/initrd/fdt images */ @@ -452,6 +455,11 @@ int do_bootm (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) break; #endif +#ifdef CONFIG_INTEGRITY + case IH_OS_INTEGRITY: + do_bootm_integrity (0, argc, argv, &images); + break; +#endif } show_boot_progress (-9); @@ -1144,3 +1152,33 @@ static int do_bootm_qnxelf(int flag, int argc, char *argv[], return 1; } #endif + +#ifdef CONFIG_INTEGRITY +static int do_bootm_integrity (int flag, int argc, char *argv[], + bootm_headers_t *images) +{ + void (*entry_point)(void); + +#if defined(CONFIG_FIT) + if (!images->legacy_hdr_valid) { + fit_unsupported_reset ("INTEGRITY"); + return 1; + } +#endif + + entry_point = (void (*)(void))images->ep; + + printf ("## Transferring control to INTEGRITY (at address %08lx) ...\n", + (ulong)entry_point); + + show_boot_progress (15); + + /* + * INTEGRITY Parameters: + * None + */ + (*entry_point)(); + + return 1; +} +#endif diff --git a/common/image.c b/common/image.c index 78efe2e..b011932 100644 --- a/common/image.c +++ b/common/image.c @@ -116,6 +116,9 @@ static table_entry_t uimage_os[] = { { IH_OS_QNX, "qnx", "QNX", }, { IH_OS_VXWORKS, "vxworks", "VxWorks", }, #endif +#if defined(CONFIG_INTEGRITY) || defined(USE_HOSTCC) + { IH_OS_INTEGRITY,"integrity", "INTEGRITY", }, +#endif #ifdef USE_HOSTCC { IH_OS_4_4BSD, "4_4bsd", "4_4BSD", }, { IH_OS_DELL, "dell", "Dell", }, diff --git a/doc/uImage.FIT/source_file_format.txt b/doc/uImage.FIT/source_file_format.txt index 1e30d22..157936e 100644 --- a/doc/uImage.FIT/source_file_format.txt +++ b/doc/uImage.FIT/source_file_format.txt @@ -169,7 +169,7 @@ the '/images' node should have the following layout: - os : OS name, mandatory for type="kernel", valid OS names are: "openbsd", "netbsd", "freebsd", "4_4bsd", "linux", "svr4", "esix", "solaris", "irix", "sco", "dell", "ncr", "lynxos", "vxworks", "psos", "qnx", "u_boot", - "rtems", "unity". + "rtems", "unity", "integrity". - arch : Architecture name, mandatory for types: "standalone", "kernel", "firmware", "ramdisk" and "fdt". Valid architecture names are: "alpha", "arm", "i386", "ia64", "mips", "mips64", "ppc", "s390", "sh", "sparc", diff --git a/include/image.h b/include/image.h index 9be806e..4654485 100644 --- a/include/image.h +++ b/include/image.h @@ -85,6 +85,7 @@ #define IH_OS_RTEMS 18 /* RTEMS */ #define IH_OS_ARTOS 19 /* ARTOS */ #define IH_OS_UNITY 20 /* Unity OS */ +#define IH_OS_INTEGRITY 21 /* INTEGRITY */ /* * CPU Architecture Codes (supported by Linux) -- 1.5.4.3

2 1