[rpi] Resolve comments

modm-io · Aug 18, 2020 · d814b26 · d814b26
1 parent ba2f1a0
commit d814b26
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/modm/platform/gpio/rpi/module.lb b/src/modm/platform/gpio/rpi/module.lb
@@ -17,7 +17,11 @@ def init(module):
 
 
 def prepare(module, options):
+<<<<<<< HEAD
+    if not options[":target"].has_driver("gpio:rpi"):
+=======
     if not options[":target"].has_driver("gpio"):
+>>>>>>> 8f79fca55d7a3be9e5d7045b568eb68888c66c48
         return False
 
     module.depends(":architecture:gpio")

diff --git a/tools/devices/hosted/rpi.xml b/tools/devices/hosted/rpi.xml
@@ -4,8 +4,6 @@
   <device platform="hosted" family="rpi">
     <naming-schema>{platform}-{family}</naming-schema>
 
-    <attribute-core value="x86"/>
-
     <driver name="core" type="rpi"/>
     <driver name="gpio" type="rpi"/>
     <driver name="uart" type="hosted"/>