From efa2caaa9070207a78c637b6c51ce9169943e924 Mon Sep 17 00:00:00 2001 From: Mantas Pucka Date: Fri, 24 Oct 2014 14:13:48 +0300 Subject: [PATCH] Add (c) notices, changelog, version system --- CHANGELOG | 9 +++++++++ Makefile | 1 + u-boot/Makefile | 1 + u-boot/board/ar7240/carambola2/carambola2.c | 4 ++-- u-boot/board/ar7240/common/usb_boot.c | 8 ++++++++ u-boot/drivers/usb/host/ehci-ar9331.c | 8 ++++++++ 6 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 CHANGELOG diff --git a/CHANGELOG b/CHANGELOG new file mode 100644 index 0000000000..78fdfed37b --- /dev/null +++ b/CHANGELOG @@ -0,0 +1,9 @@ +CHANGELOG +========= + + devel - v2.1 + * Add configurable boot-stop string support + * Add configurable baudrate support + +2014-10-21 - v2.0 + * Initial USB support \ No newline at end of file diff --git a/Makefile b/Makefile index 6bb3c58a38..19e08e821c 100644 --- a/Makefile +++ b/Makefile @@ -24,6 +24,7 @@ export COMPRESSED_UBOOT=0 export FLASH_SIZE=16 export NEW_DDR_TAP_CAL=1 export CONFIG_HORNET_XTAL=40 +export CARABOOT_RELEASE=v2.1-dev IMAGEPATH=$(BUILD_TOPDIR)/bin UBOOT_BINARY=u-boot.bin diff --git a/u-boot/Makefile b/u-boot/Makefile index a7bf08c223..eaecd077fa 100644 --- a/u-boot/Makefile +++ b/u-boot/Makefile @@ -273,6 +273,7 @@ unconfig: carambola2_config: unconfig hornet_common_config @echo "#define FLASH_SIZE $(FLASH_SIZE)" >>include/config.h + @echo "#define CARABOOT_RELEASE \"$(CARABOOT_RELEASE)\"" >>include/config.h @./mkconfig -a carambola2 mips mips carambola2 ar7240 ar7240 diff --git a/u-boot/board/ar7240/carambola2/carambola2.c b/u-boot/board/ar7240/carambola2/carambola2.c index 64c666d7f0..19f9e24fbe 100644 --- a/u-boot/board/ar7240/carambola2/carambola2.c +++ b/u-boot/board/ar7240/carambola2/carambola2.c @@ -454,14 +454,14 @@ long int initdram(int board_type) #ifdef COMPRESSED_UBOOT int checkboard (char *board_string) { - strcpy(board_string, "Caraboot v2.0 (AR9331) U-boot"); + strcpy(board_string, "Caraboot "CARABOOT_RELEASE" (AR9331) U-boot"); return 0; } #else int checkboard (void) { printf("=====================================\n"); - printf("Caraboot v2.0 (AR9331) U-boot\n"); + printf("Caraboot "CARABOOT_RELEASE" (AR9331) U-boot\n"); printf("http://www.8devices.com/\n"); printf("-------------------------------------\n"); return 0; diff --git a/u-boot/board/ar7240/common/usb_boot.c b/u-boot/board/ar7240/common/usb_boot.c index 46f49c05bd..07eb2c21d6 100644 --- a/u-boot/board/ar7240/common/usb_boot.c +++ b/u-boot/board/ar7240/common/usb_boot.c @@ -1,3 +1,11 @@ +/* + * USB boot functions for Carambola2 + * + * Copyright (C) 2014 Mantas Pucka + * + * SPDX-License-Identifier:GPL-2.0 + */ + #include #include #include diff --git a/u-boot/drivers/usb/host/ehci-ar9331.c b/u-boot/drivers/usb/host/ehci-ar9331.c index b2247a0d35..580084836b 100644 --- a/u-boot/drivers/usb/host/ehci-ar9331.c +++ b/u-boot/drivers/usb/host/ehci-ar9331.c @@ -1,3 +1,11 @@ +/* + * Atheros AR933x USB driver initialization + * + * Copyright (C) 2014 Mantas Pucka + * + * SPDX-License-Identifier:GPL-2.0 + */ + #include #include #include