panda: fix upstream merge conflicts (#97)

python/constants.py

@@ -25,6 +25,21 @@ class McuConfig(NamedTuple):
     return self.bootstub_address + sum(self.sector_sizes[:i])
 
 
+F4Config = McuConfig(
+  "STM32F4",
+  0x463,
+  [0x4000 for _ in range(4)] + [0x10000] + [0x20000 for _ in range(11)],
+  16,
+  0x1FFF7A10,
+  0x800,
+  0x1FFF79C0,
+  0x8004000,
+  "panda.bin.signed",
+  0x8000000,
+  "bootstub.panda.bin",
+)
+
+
 H7Config = McuConfig(
   "STM32H7",
   0x483,
@@ -42,6 +57,7 @@ H7Config = McuConfig(
 
 @enum.unique
 class McuType(enum.Enum):
+  F4 = F4Config
   H7 = H7Config
 
   @property