From e8492ba06b21093b0fdb666a201c7300e1f31f1e Mon Sep 17 00:00:00 2001
From: Jeff Hatch <jhatch@multitech.com>
Date: Thu, 25 May 2017 10:39:19 -0500
Subject: Add PRINC and boost-python stuff to mtcdt.conf for now.  Hopefully
 can find a way to put these in local.conf or something

---
 conf/machine/mtcdt.conf      |  4 ++++
 conf/machine/mtcdt.conf.orig | 46 --------------------------------------------
 2 files changed, 4 insertions(+), 46 deletions(-)
 delete mode 100644 conf/machine/mtcdt.conf.orig

(limited to 'conf')

diff --git a/conf/machine/mtcdt.conf b/conf/machine/mtcdt.conf
index c966d9f..83a47a4 100644
--- a/conf/machine/mtcdt.conf
+++ b/conf/machine/mtcdt.conf
@@ -40,3 +40,7 @@ UBOOT_ENTRYPOINT = "0x20008000"
 UBOOT_LOADADDRESS = "0x20008000"
 
 PREFERRED_VERSION_rs9113 = '1.5.0'
+
+PRINC ?= "0"
+
+PACKAGECONFIG_append_pn-boost = " python"
diff --git a/conf/machine/mtcdt.conf.orig b/conf/machine/mtcdt.conf.orig
deleted file mode 100644
index 83a47a4..0000000
--- a/conf/machine/mtcdt.conf.orig
+++ /dev/null
@@ -1,46 +0,0 @@
-#@TYPE: Machine
-#@Name: Multi-Tech MTCDT
-#@DESCRIPTION: Machine configuration for the MultiConnect Conduit MTCDT hardware
-
-require conf/machine/include/tune-arm926ejs.inc
-
-MACHINE_FEATURES = "ext2 ext3 usbhost usbgadget ppp"
-PREFERRED_PROVIDER_virtual/kernel = "linux"
-PREFERRED_VERSION_linux = "3.12.%"
-
-MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "kernel-module-vizzini"
-PREFERRED_VERSION_kernel-module-vizzini ?= "1.1"
-
-DEFAULTTUNE = "arm926ejs"
-TUNE_CCARGS = " -march=armv5te -marm -mthumb-interwork -mtune=arm926ej-s"
-TUNE_FEATURES = "arm armv5 thumb dsp arm926ejs"
-ARMPKGSFX_THUMB="t"
-
-# used by sysvinit_2
-SERIAL_CONSOLES = "115200;ttyS0"
-#don't try to access tty1
-USE_VT = "0"
-
-UBOOT_MACHINE = "at91sam9x5ek_nandflash_config"
-PREFERRED_VERSION_u-boot = "2016.09.01"
-
-AT91BOOTSTRAP_BOARD = "at91sam9x5eknf_uboot"
-PREFERRED_VERSION_at91bootstrap = "3.5.3"
-
-KERNEL_IMAGETYPE = "uImage"
-# remove kernel-image from rootfs by overriding kernel-base DEPS
-RDEPENDS_kernel-base = ""
-
-EXTRA_IMAGEDEPENDS += "at91bootstrap u-boot"
-
-IMAGE_FSTYPES =+ "jffs2 tar.gz"
-EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 --pagesize=0x800 -n"
-
-UBOOT_ENTRYPOINT = "0x20008000"
-UBOOT_LOADADDRESS = "0x20008000"
-
-PREFERRED_VERSION_rs9113 = '1.5.0'
-
-PRINC ?= "0"
-
-PACKAGECONFIG_append_pn-boost = " python"
-- 
cgit v1.2.3