Skip to content

Commit

Permalink
Merge pull request #143 from abhijit-mahajani-imgtec/pistachio-4.4
Browse files Browse the repository at this point in the history
Pistachio 4.4
  • Loading branch information
nikhil-zinjurde-imgtec authored Sep 30, 2016
2 parents dac951d + d0a8cf4 commit 29ccd97
Show file tree
Hide file tree
Showing 152 changed files with 86,712 additions and 134 deletions.
4 changes: 4 additions & 0 deletions package/boot/uboot-envtools/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,10 @@ ifneq ($(CONFIG_TARGET_oxnas),)
$(INSTALL_DIR) $(1)/etc/uci-defaults
$(INSTALL_BIN) ./files/oxnas $(1)/etc/uci-defaults/30_uboot-envtools
endif
ifneq ($(CONFIG_TARGET_pistachio),)
$(INSTALL_DIR) $(1)/etc/uci-defaults
$(INSTALL_DATA) ./files/pistachio $(1)/etc/uci-defaults/30_uboot-envtools
endif
ifneq ($(CONFIG_TARGET_ramips),)
$(INSTALL_DIR) $(1)/etc/uci-defaults
$(INSTALL_DATA) ./files/ramips $(1)/etc/uci-defaults/30_uboot-envtools
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
#!/bin/sh
#
# Copyright (C) 2016 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#

[ -e /etc/config/ubootenv ] && exit 0

Expand Down
26 changes: 4 additions & 22 deletions target/linux/pistachio/Makefile
Original file line number Diff line number Diff line change
@@ -1,26 +1,8 @@
#
# Copyright (c) 2016, Imagination Technologies Limited and/or its affiliated group companies.
# All rights reserved.
# Copyright (C) 2016 OpenWrt.org
#
# 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. Neither the name of the copyright holder nor the names of its contributors may be used to
# endorse or promote products derived from this software without specific prior written
# permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 COPYRIGHT HOLDER 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.
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#

include $(TOPDIR)/rules.mk
Expand All @@ -31,7 +13,7 @@ BOARDNAME:=IMG MIPS Pistachio
FEATURES:=targz nand ubifs audio ramdisk
SUBTARGETS=marduk

KERNEL_PATCHVER:=4.1
KERNEL_PATCHVER:=4.4

include $(INCLUDE_DIR)/target.mk

Expand Down
Binary file modified target/linux/pistachio/base-files/lib/firmware/img/uccp420wlan/MAC_LOADER.ldr
100755 → 100644
Binary file not shown.
Binary file modified target/linux/pistachio/base-files/lib/firmware/img/uccp420wlan/MCP_LOADER.ldr
100755 → 100644
Binary file not shown.
Loading

0 comments on commit 29ccd97

Please sign in to comment.